mlnx-ofa_kernel:Upgrade OFED driver version to 24.10
This upgrades the OFED driver package to the mlnx-ofa_kernel-24.10.tgz located in https://linux.mellanox.com/public/repo/mlnx_ofed/ 24.10-1.1.4.0/SRPMS/. As part of the plan to upgrade to the 6.12 kernel, we also want to update the Nvidia/Mellanox driver to the latest supported version. The new versions are: mlnx-ofa_kernel-24.10.tgz dma-core-2410mlnx54.tar.gz mlnx-tools-24.10.tar.gz Verification: - Build module success for kernel-std/kernel-rt. - Build package success for rdma-core, mstflint and mlnx-tools. - Install onto a StarlingX system with All-in-One lab with network adapters Mellanox's OFED. The network adapters of controllers are Mellanox Technologies MT27800 Family [ConnectX-5]. - Install onto a StarlingX system in labs with network adapters Mellanox's OFED. The network adapters of controllers are [ConnectX-6 DX],[ConnectX-6 LX]. - The physical function interfaces are up and pass packets for rt and std. - create vfs, ensure that the interface can come up and pass packets. - RDMA/Infiniband over Ethernet functionalities of the Mellanox adapters were successfully tested using the Linux RDMA community's perftest package. Story: 2011384 Task: 51890 Depends-On: https://review.opendev.org/c/starlingx/kernel/+/945449 Change-Id: I1a9f7881e3ba6805354f684b2001bc931350f348 Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
This commit is contained in:
parent
29061b437b
commit
bd9c042318
@ -1,7 +1,7 @@
|
||||
From 90565225e863d5a8103dd9fc81f88804bdf4c1a0 Mon Sep 17 00:00:00 2001
|
||||
From d70f7bf8a78251974580a84c24f5d34c3ca640ba Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Wed, 23 Mar 2022 22:59:40 -0700
|
||||
Subject: [PATCH] mlnx-ofa_kernel: adapt the debian folder for starlingX
|
||||
Subject: [PATCH 1/2] mlnx-ofa_kernel: adapt the debian folder for starlingX
|
||||
|
||||
Adapt the upstream debian folder for starlingX:
|
||||
- don't use dkms and build the kernel modules from source code;
|
||||
@ -21,16 +21,18 @@ Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
|
||||
[jm: Adapted the patch for context change]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
[jm: Adapted the patch for context change of the 24.10 version.]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
debian/control | 19 +++------
|
||||
debian/extra/mlnx.conf | 19 +++++++++
|
||||
debian/control | 22 +++-------
|
||||
debian/extra/mlnx.conf | 20 +++++++++
|
||||
debian/mlnx-ofed-kernel-modules-rt.postinst | 17 ++++++++
|
||||
debian/mlnx-ofed-kernel-modules-rt.prerm | 10 +++++
|
||||
debian/mlnx-ofed-kernel-utils-rt.postinst | 47 +++++++++++++++++++++
|
||||
debian/mlnx-ofed-kernel-utils-rt.postrm | 14 ++++++
|
||||
debian/mlnx-ofed-kernel-utils-rt.prerm | 23 ++++++++++
|
||||
debian/rules | 24 ++++++++---
|
||||
8 files changed, 155 insertions(+), 18 deletions(-)
|
||||
8 files changed, 156 insertions(+), 21 deletions(-)
|
||||
create mode 100644 debian/extra/mlnx.conf
|
||||
create mode 100755 debian/mlnx-ofed-kernel-modules-rt.postinst
|
||||
create mode 100755 debian/mlnx-ofed-kernel-modules-rt.prerm
|
||||
@ -39,7 +41,7 @@ Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
create mode 100755 debian/mlnx-ofed-kernel-utils-rt.prerm
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 2b00d80..6b59989 100644
|
||||
index bd3cf23..701a9c5 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -2,7 +2,7 @@ Source: mlnx-ofed-kernel
|
||||
@ -48,10 +50,10 @@ index 2b00d80..6b59989 100644
|
||||
Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
|
||||
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms,
|
||||
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
|
||||
Standards-Version: 3.9.2
|
||||
Standards-Version: 4.2.0
|
||||
Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
|
||||
|
||||
@@ -13,18 +13,11 @@ Depends: ${misc:Depends}, coreutils, pciutils, grep, procps, module-init-tools |
|
||||
@@ -13,18 +13,8 @@ Depends: ${misc:Depends}, coreutils, pciutils, grep, procps, module-init-tools |
|
||||
Conflicts: mlnx-en-utils
|
||||
Description: Userspace tools to restart and tune mlnx-ofed kernel modules
|
||||
|
||||
@ -67,20 +69,20 @@ index 2b00d80..6b59989 100644
|
||||
- This package provides integration with the DKMS infrastructure for
|
||||
- automatically building out of tree kernel modules.
|
||||
- .
|
||||
- This package provides the source code for the mlnx-ofed kernel modules.
|
||||
- .
|
||||
- This package contains the source to be built with dkms.
|
||||
+Package: mlnx-ofed-kernel-modules@KERNEL_TYPE@
|
||||
+Architecture: any
|
||||
+Depends: ${shlibs:Depends}, ${misc:Depends}, mlnx-ofed-kernel-utils
|
||||
+Description: ofed kernel modules
|
||||
+ This package provides the mlnx-ofed out of tree kernel modules.
|
||||
This package provides the source code for the mlnx-ofed kernel modules.
|
||||
.
|
||||
This package contains the source to be built with dkms.
|
||||
diff --git a/debian/extra/mlnx.conf b/debian/extra/mlnx.conf
|
||||
new file mode 100644
|
||||
index 0000000..d6ced47
|
||||
index 0000000..0cb2131
|
||||
--- /dev/null
|
||||
+++ b/debian/extra/mlnx.conf
|
||||
@@ -0,0 +1,19 @@
|
||||
@@ -0,0 +1,20 @@
|
||||
+mlx_compat
|
||||
+ib_cm
|
||||
+ib_core
|
||||
@ -100,6 +102,7 @@ index 0000000..d6ced47
|
||||
+rpcrdma
|
||||
+svcrdma
|
||||
+xprtrdma
|
||||
+
|
||||
diff --git a/debian/mlnx-ofed-kernel-modules-rt.postinst b/debian/mlnx-ofed-kernel-modules-rt.postinst
|
||||
new file mode 100755
|
||||
index 0000000..a67c0c4
|
||||
@ -242,7 +245,7 @@ index 0000000..79e96b5
|
||||
+
|
||||
+exit 0
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 7e32e3c..e9b2564 100755
|
||||
index f3cfff4..94d1616 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -17,8 +17,20 @@
|
||||
@ -267,8 +270,8 @@ index 7e32e3c..e9b2564 100755
|
||||
+
|
||||
MLXNUMC = $(shell grep ^processor /proc/cpuinfo | wc -l)
|
||||
NJOBS ?= $(shell if [ $(MLXNUMC) -lt 16 ]; then echo $(MLXNUMC); else echo 16; fi)
|
||||
|
||||
@@ -27,7 +39,7 @@ psource:=$(pname)-source
|
||||
ifeq ($(WITH_DKMS),1)
|
||||
@@ -34,7 +46,7 @@ psource:=$(pname)-source
|
||||
ifeq ($(WITH_DKMS),1)
|
||||
pdkms:=$(pname)-dkms
|
||||
else
|
||||
@ -277,7 +280,7 @@ index 7e32e3c..e9b2564 100755
|
||||
endif
|
||||
putils:=$(pname)-utils
|
||||
|
||||
@@ -40,7 +52,6 @@ export INSTALL_MOD_PATH:=$(CURDIR)/debian/$(pdkms)
|
||||
@@ -47,7 +59,6 @@ export INSTALL_MOD_PATH:=$(CURDIR)/debian/$(pdkms)
|
||||
DIST_NAME := $(shell lsb_release -si)
|
||||
DIST_RELEASE := $(DIST_NAME)/$(shell lsb_release -sc)
|
||||
|
||||
@ -285,7 +288,7 @@ index 7e32e3c..e9b2564 100755
|
||||
kernelver1 = $(shell echo $(kernelver) | sed -e 's/_/-/g')
|
||||
kernel_source_dir ?= "/lib/modules/$(kernelver)/build"
|
||||
deb_arch = $(shell uname -m)
|
||||
@@ -62,7 +73,7 @@ override_dh_auto_configure:
|
||||
@@ -69,7 +80,7 @@ override_dh_auto_configure:
|
||||
ifneq ($(WITH_DKMS),1)
|
||||
@echo Building for $(kernelver)
|
||||
find compat -type f -exec touch -t 200012201010 '{}' \; || true
|
||||
@ -294,8 +297,8 @@ index 7e32e3c..e9b2564 100755
|
||||
endif
|
||||
|
||||
mod_dev_dir = /usr/src/ofa_kernel/$(deb_arch)/$(kernelver)
|
||||
@@ -179,6 +190,9 @@ endif
|
||||
install -m 0755 source/ofed_scripts/odp_stat.sh debian/$(putils)/usr/sbin
|
||||
@@ -189,6 +200,9 @@ endif
|
||||
install -m 0755 source/ofed_scripts/setup_mr_cache.sh debian/$(putils)/usr/sbin
|
||||
install -m 0755 ofed_scripts/mlnx_bf_assign_ct_cores.sh debian/$(putils)/usr/share/mlnx_ofed
|
||||
|
||||
+ dh_installdirs -p$(putils) /etc/modules-load.d/
|
||||
@ -305,5 +308,5 @@ index 7e32e3c..e9b2564 100755
|
||||
|
||||
|
||||
--
|
||||
2.42.0
|
||||
2.47.1
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
From f5763f2acdbad9c9cd055ee7c3049356ecf34b29 Mon Sep 17 00:00:00 2001
|
||||
From 27c4b861cef239a3939e9b159d88294b0d6bfe78 Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Sun, 22 May 2022 21:02:25 -0700
|
||||
Subject: [PATCH] mlnx-ofa_kernel: Add dev package.
|
||||
Subject: [PATCH 2/2] mlnx-ofa_kernel: Add dev package.
|
||||
|
||||
This commit moves source code files "/usr/src/ofa_kernel/x86_64/" from
|
||||
modules package to dev package, only leaving all ko in modules package.
|
||||
@ -16,8 +16,10 @@ based on ofed for std and rt building.
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
[jm: Adapted the patch for context change]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
[jm: Adapted the patch for context change with the 24.10 version.]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
debian/control | 7 +++++--
|
||||
debian/control | 6 ++++++
|
||||
debian/mlnx-ofed-kernel-dev-rt.postinst | 17 +++++++++++++++++
|
||||
debian/mlnx-ofed-kernel-dev-rt.prerm | 10 ++++++++++
|
||||
debian/mlnx-ofed-kernel-dev.postinst | 17 +++++++++++++++++
|
||||
@ -27,17 +29,17 @@ Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
debian/mlnx-ofed-kernel-modules.postinst | 12 ------------
|
||||
debian/mlnx-ofed-kernel-modules.prerm | 7 -------
|
||||
debian/rules | 17 +++++++++--------
|
||||
10 files changed, 68 insertions(+), 48 deletions(-)
|
||||
10 files changed, 69 insertions(+), 46 deletions(-)
|
||||
create mode 100755 debian/mlnx-ofed-kernel-dev-rt.postinst
|
||||
create mode 100755 debian/mlnx-ofed-kernel-dev-rt.prerm
|
||||
create mode 100755 debian/mlnx-ofed-kernel-dev.postinst
|
||||
create mode 100755 debian/mlnx-ofed-kernel-dev.prerm
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 6b59989..a90c1ff 100644
|
||||
index 701a9c5..6df229d 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -18,6 +18,9 @@ Architecture: any
|
||||
@@ -18,3 +18,9 @@ Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}, mlnx-ofed-kernel-utils
|
||||
Description: ofed kernel modules
|
||||
This package provides the mlnx-ofed out of tree kernel modules.
|
||||
@ -46,9 +48,7 @@ index 6b59989..a90c1ff 100644
|
||||
+Architecture: any
|
||||
+Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
+Description: ofed kernel modules
|
||||
This package provides the source code for the mlnx-ofed kernel modules.
|
||||
- .
|
||||
- This package contains the source to be built with dkms.
|
||||
+ This package provides the source code for the mlnx-ofed kernel modules.
|
||||
diff --git a/debian/mlnx-ofed-kernel-dev-rt.postinst b/debian/mlnx-ofed-kernel-dev-rt.postinst
|
||||
new file mode 100755
|
||||
index 0000000..a67c0c4
|
||||
@ -202,10 +202,10 @@ index 6f1b1df..a2c66fa 100755
|
||||
-
|
||||
#DEBHELPER#
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index e9b2564..c5925e8 100755
|
||||
index 94d1616..d19f467 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -42,6 +42,7 @@ else
|
||||
@@ -49,6 +49,7 @@ else
|
||||
pdkms:=$(pname)-modules@KERNEL_TYPE@
|
||||
endif
|
||||
putils:=$(pname)-utils
|
||||
@ -213,7 +213,7 @@ index e9b2564..c5925e8 100755
|
||||
|
||||
pversion := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-.\+/\1/p')
|
||||
prel := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\([^-]\+\)-\(.\+\)/\2/p')
|
||||
@@ -123,12 +124,12 @@ ifeq ($(WITH_DKMS),1)
|
||||
@@ -134,12 +135,12 @@ ifeq ($(WITH_DKMS),1)
|
||||
dh_installdirs -p$(pdkms) usr/src/ofa_kernel/
|
||||
# copy the ofa-kernel build headers using ofed_scripts/pre_build.sh in the DKMS MAKE step (called from ofed_scripts/pre_build.sh).
|
||||
else
|
||||
@ -232,7 +232,7 @@ index e9b2564..c5925e8 100755
|
||||
endif
|
||||
|
||||
# Force DKMS to install our modules.
|
||||
@@ -213,8 +214,8 @@ ifneq ($(WITH_DKMS),1)
|
||||
@@ -230,8 +231,8 @@ else
|
||||
sed -i \
|
||||
-e 's/@KVER@/$(kernelver)/' \
|
||||
-e 's/@ARCH@/$(deb_arch)/' \
|
||||
@ -244,5 +244,5 @@ index e9b2564..c5925e8 100755
|
||||
|
||||
ifneq ($(MLNX_KO_NO_STRIP),1)
|
||||
--
|
||||
2.42.0
|
||||
2.47.1
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
---
|
||||
debver: 23.10@
|
||||
debver: 24.10@
|
||||
debname: mlnx-ofed-kernel
|
||||
dl_path:
|
||||
name: mlnx-ofa-kernel-23.10.tgz
|
||||
name: mlnx-ofa-kernel-24.10.tgz
|
||||
url: "https://linux.mellanox.com/public/repo/mlnx_ofed/\
|
||||
23.10-2.1.3.1/SRPMS/mlnx-ofa_kernel-23.10.tgz"
|
||||
sha256sum: 9d0082bd7379098f750d0127c623ed0a29629bb149944f213d43429eea7d9519
|
||||
24.10-1.1.4.0/SRPMS/mlnx-ofa_kernel-24.10.tgz"
|
||||
sha256sum: 4dc6801af6a8d2237b4215927d373f717bc30875b0f7e0be9e055f44f6cb59d4
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
|
@ -1,62 +0,0 @@
|
||||
From c6a43833d3b9bf97049e373d20a6eb7daff91c36 Mon Sep 17 00:00:00 2001
|
||||
From: Steven Webster <steven.webster@windriver.com>
|
||||
Date: Thu, 11 Aug 2022 12:32:48 -0400
|
||||
Subject: [PATCH] Enable mlx5 onboard udev name
|
||||
|
||||
This patch prioritizes the udev renaming rule for mlx5 controlled
|
||||
devices to take the onboard name over the slot/path name.
|
||||
|
||||
This is consistent with the 70-persistent-net.rules file written
|
||||
by the StarlingX installer.
|
||||
|
||||
It is also consistent with the naming order in the 99-default.link
|
||||
file.
|
||||
|
||||
Without this patch, there could be an inconsistency with the
|
||||
70-persistent-net.rules first re-naming the device to its
|
||||
slot/path name, and then being overridden by the Mellanox specific
|
||||
82-net-setup-link.rules.
|
||||
|
||||
Signed-off-by: Steven Webster <steven.webster@windriver.com>
|
||||
[jm: Adapted the patch for context change]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
ofed_scripts/vf-net-link-name.sh | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/ofed_scripts/vf-net-link-name.sh b/ofed_scripts/vf-net-link-name.sh
|
||||
index e22ae76..1134629 100755
|
||||
--- a/ofed_scripts/vf-net-link-name.sh
|
||||
+++ b/ofed_scripts/vf-net-link-name.sh
|
||||
@@ -93,7 +93,9 @@ function test_if_pf() {
|
||||
}
|
||||
|
||||
if [ "$skip" == "0" ]; then
|
||||
- if [ -n "$ID_NET_NAME_SLOT" ]; then
|
||||
+ if [ -n "$ID_NET_NAME_ONBOARD" ]; then
|
||||
+ NAME="${ID_NET_NAME_ONBOARD%%np[[:digit:]]}"
|
||||
+ elif [ -n "$ID_NET_NAME_SLOT" ]; then
|
||||
NAME="${ID_NET_NAME_SLOT%%np[[:digit:]]}"
|
||||
elif [ -n "$ID_NET_NAME_PATH" ]; then
|
||||
NAME="${ID_NET_NAME_PATH%%np[[:digit:]]}"
|
||||
@@ -226,11 +228,14 @@ for cnt in {1..2}; do
|
||||
continue
|
||||
fi
|
||||
|
||||
- parent_path=`get_pci_name $pci ID_NET_NAME_SLOT`
|
||||
+ parent_path=`get_pci_name $pci ID_NET_NAME_ONBOARD`
|
||||
if [ -z "$parent_path" ]; then
|
||||
- parent_path=`get_pci_name $pci ID_NET_NAME_PATH`
|
||||
+ parent_path=`get_pci_name $pci ID_NET_NAME_SLOT`
|
||||
if [ -z "$parent_path" ]; then
|
||||
- continue
|
||||
+ parent_path=`get_pci_name $pci ID_NET_NAME_PATH`
|
||||
+ if [ -z "$parent_path" ]; then
|
||||
+ continue
|
||||
+ fi
|
||||
fi
|
||||
fi
|
||||
echo "NAME=${parent_path}_$PORT"
|
||||
--
|
||||
2.43.0
|
||||
|
@ -1,47 +0,0 @@
|
||||
From d05ff19ed3f3bb6bc914135531e4bdb6d332adce Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Thu, 11 Apr 2024 02:48:47 +0000
|
||||
Subject: [PATCH] mlnx-ofa_kernel: fix bnxt_re build error
|
||||
|
||||
NETDEV_CHANGEINFODATA already exists as enum 25 in kernel header file
|
||||
netdevice.h, but it is defined 0x0019 here, so that NETDEV_CHANGEINFODATA
|
||||
and NETDEV_BONDING_INFO is same value that caused the following errors.
|
||||
|
||||
bnxt_re-227.0.130.0/main.c: In function bnxt_re_task:
|
||||
bnxt_re-227.0.130.0/main.c:5668:2: error: duplicate case value
|
||||
5668 | case NETDEV_CHANGEINFODATA:
|
||||
| ^~~~
|
||||
bnxt_re-227.0.130.0/main.c:5642:2: note: previously used here
|
||||
5642 | case NETDEV_BONDING_INFO:
|
||||
| ^~~~
|
||||
bnxt_re-227.0.130.0/main.c: In function bnxt_re_netdev_event:
|
||||
bnxt_re-227.0.130.0/main.c:5908:2: error: duplicate case value
|
||||
5908 | case NETDEV_CHANGEINFODATA:
|
||||
| ^~~~
|
||||
bnxt_re-227.0.130.0/main.c:5870:2: note: previously used here
|
||||
5870 | case NETDEV_BONDING_INFO:
|
||||
| ^~~~
|
||||
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
include/linux/netdevice.h | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
|
||||
index 277e5a0..756809d 100644
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -24,10 +24,6 @@
|
||||
( (netdev)->ethtool_ops = (ops) )
|
||||
#endif
|
||||
|
||||
-#ifndef NETDEV_BONDING_INFO
|
||||
-#define NETDEV_BONDING_INFO 0x0019
|
||||
-#endif
|
||||
-
|
||||
static inline int netdev_set_master(struct net_device *dev,
|
||||
struct net_device *master)
|
||||
{
|
||||
--
|
||||
2.43.0
|
||||
|
@ -1,44 +0,0 @@
|
||||
From 04b9a5dd72f61d9664882b61c8864dd5faa8415b Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Tue, 25 Jun 2024 02:58:29 +0000
|
||||
Subject: [PATCH] Fix the obsolete module init
|
||||
|
||||
Update module init call to use kernel provided macros, such
|
||||
that they gain correct IBT attributes.
|
||||
|
||||
We encouter the following error during load the module mlx_compat.
|
||||
"Missing ENDBR: __init_backport+0x0/0xff0 [mlx_compat]"
|
||||
|
||||
Reported-by: Guilherme Batista Leite <guilhermebatista.leite@windriver.com>
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
include/linux/compat-2.6.h | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/linux/compat-2.6.h b/include/linux/compat-2.6.h
|
||||
index 5446d9a..8df7ce9 100644
|
||||
--- a/include/linux/compat-2.6.h
|
||||
+++ b/include/linux/compat-2.6.h
|
||||
@@ -49,14 +49,15 @@ void mlx_backport_dependency_symbol(void);
|
||||
#endif
|
||||
|
||||
#undef module_init
|
||||
-#define module_init(initfn) \
|
||||
+#define module_init(initfn) \
|
||||
static int __init __init_backport(void) \
|
||||
{ \
|
||||
- mlx_backport_dependency_symbol(); \
|
||||
+ mlx_backport_dependency_symbol(); \
|
||||
return initfn(); \
|
||||
} \
|
||||
- int init_module(void) __copy(initfn) __attribute__((alias("__init_backport")));
|
||||
-
|
||||
+ int init_module(void) __copy(initfn) \
|
||||
+ __attribute__((alias("__init_backport"))); \
|
||||
+ ___ADDRESSABLE(init_module, __initdata);
|
||||
|
||||
/*
|
||||
* Each compat file represents compatibility code for new kernel
|
||||
--
|
||||
2.43.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
0001-Enable-mlx5-onboard-udev-name.patch
|
||||
0002-mlnx-ofa_kernel-fix-bnxt_re-build-error.patch
|
||||
0003-Fix-the-obsolete-module-init.patch
|
@ -1,9 +1,9 @@
|
||||
From 102c8648edf5271262c8488721f61182f0adca54 Mon Sep 17 00:00:00 2001
|
||||
From 9280c296d0f8c3bc880fb5d551945c1cc01a6fc8 Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Sun, 5 Nov 2023 18:51:31 -0800
|
||||
Subject: [PATCH] mlnx-tools: Fix the build error.
|
||||
|
||||
This changes 5.2.0 from 5.2.0-OFED.5.9.0.5.5 in changelog to
|
||||
This changes 24.10 from 24.10-OFED.24.10.0.4.9 in changelog to
|
||||
fix the following build error.
|
||||
|
||||
debrepack - ERROR - dpkg-architecture: warning: cannot determine CC system type, falling back to default (native compilation)
|
||||
@ -25,15 +25,15 @@ Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/debian/changelog b/debian/changelog
|
||||
index 41fed5c..c9b4370 100644
|
||||
index 7201de2..9f6c974 100644
|
||||
--- a/debian/changelog
|
||||
+++ b/debian/changelog
|
||||
@@ -1,4 +1,4 @@
|
||||
-mlnx-tools (5.2.0-OFED.5.9.0.5.5) UNRELEASED; urgency=medium
|
||||
+mlnx-tools (5.2.0) UNRELEASED; urgency=medium
|
||||
-mlnx-tools (24.10-OFED.24.10.0.4.9) UNRELEASED; urgency=medium
|
||||
+mlnx-tools (24.10) UNRELEASED; urgency=medium
|
||||
|
||||
* New release cycle.
|
||||
|
||||
* Switched to a MLNX_OFED branch
|
||||
* Native package
|
||||
--
|
||||
2.42.0
|
||||
2.47.1
|
||||
|
||||
|
@ -1,11 +1,11 @@
|
||||
---
|
||||
debver: 5.2.0
|
||||
debver: 24.10@
|
||||
debname: mlnx-tools
|
||||
dl_path:
|
||||
name: mlnx-tools-5.2.0.tar.gz
|
||||
name: mlnx-tools-24.10.tar.gz
|
||||
url: "https://linux.mellanox.com/public/repo/mlnx_ofed/\
|
||||
5.9-0.5.6.0/SRPMS/mlnx-tools-5.2.0.tar.gz"
|
||||
sha256sum: 98ce9bef16a3ad9a392015bffbf079efe3260519db14912a02f5db59f10bec2e
|
||||
24.10-1.1.4.0/SRPMS/mlnx-tools-24.10.tar.gz"
|
||||
sha256sum: 7459a03eebc0c7f939ff9356dc0bcca4ad64120f957623f03f74523d62ee392d
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
|
@ -1,11 +1,11 @@
|
||||
---
|
||||
debver: 2307mlnx47
|
||||
debver: 2410mlnx54
|
||||
debname: rdma-core
|
||||
dl_path:
|
||||
name: rdma-core-2307mlnx47.tar.gz
|
||||
name: rdma-core-2410mlnx54.tar.gz
|
||||
url: "https://linux.mellanox.com/public/repo/mlnx_ofed/\
|
||||
23.10-2.1.3.1/SRPMS/rdma-core-2307mlnx47.tar.gz"
|
||||
sha256sum: 1697f06f491e0f004620004be7fa937d3f22603b5a5705dc4cba8fe706c0356b
|
||||
24.10-1.1.4.0/SRPMS/rdma-core-2410mlnx54.tar.gz"
|
||||
sha256sum: 69076f46ee48a76adb5aa946a18a2a2d09911ea5c8f453bf97858af19b436a21
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
GITREVCOUNT:
|
||||
|
Loading…
x
Reference in New Issue
Block a user