Files
kernel/kernel-modules/mlnx-ofa_kernel/debian/patches/0002-mlnx-ofa_kernel-fix-bnxt_re-build-error.patch
Jiping Ma ec1eeccb70 kernel-modules: re-enable bnxt_en
This commit re-enables the bnxt_en/bnxt_re OOT drivers.

We also upgrade to the driver versions recommended by Broadcom.
Upgrade the bnxt_en/bnxt_re version to 227.0.130.0 from 220.0.13.0.
(For clarity, the main driver package file name is "bcm_227.1.111.0b.tar.gz".)

The package libbnxt-re also is upgraded to the related version 227.0.130.0
because of the drivers upgradation.

We encountered a few the version compatibility issues between
bnxt_en/bnxt_re drivers and the 6.6.7 kernel. We adapted drivers' code
to the kernel 6.6.7 by referring to the upstream commits.

Verification:
* bnxt_en/bnxt_re:
  - Installation of the ISO image is successful with standard and
    low-latency profiles.
  - 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 Broadcom
    adapters were successfully tested using the Linux RDMA community's
    perftest package.

Story: 2011056
Task: 49876

Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
Change-Id: I2931cf333c28ee69662913e81c65340e633fbbc8
(cherry picked from commit cbe03073af)
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
2024-07-10 23:28:50 +00:00

48 lines
1.5 KiB
Diff

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