ba86fee885
This commit re-enables ice, i40e, iavf, igb-uio, opae-fpga-driver and
iqvlinux OOT drivers.
In order to deal with a firmware incompatibility or if a problem is
found with the in-tree driver, we will continue to support one
version of each out-of-tree driver. The out-of-tree driver versions
that we plan to keep in StarlingX have been validated in the past.
We will be preserving i40e-2.20.12, iavf-4.5.3.2, and ice-1.9.11
as out-of-tree drivers. For the X700 series of NICs, i40e-2.20.12
is compatible with NVM (non-volatile memory, or firmware) version
9.20, and for the E810 series NICs, ice-1.9.11 is compatible with
NVM version 4.22.
The drivers igb-uio, opae-fpga-driver and iqvlinux are known to only
exist as OOT.
We encountered a few the version compatibility issues after upgrading
the kernel to 6.6.7 version. We adapted drivers' code to the kernel
6.6.7 by referring to the upstream commits.
We also change the driver location folder to "weak-updates" from
"updates" for ice, iavf and i40e so that the default drivers will be
the in-tree drivers.
ice: 1.9.11
i40e: 2.20.12
iavf: 4.5.3.2
ice, i40e, iavf:
* commit b48b89f9c ("net: drop the weight argument from netif_napi_add")
https://git.yoctoproject.org/linux-yocto/commit/?h=b48b89f9c
* commit 068c38ad ("net: Remove the obsolte u64_stats_fetch_*_irq()
users (drivers).")
https://git.yoctoproject.org/linux-yocto/commit/?h=068c38ad
* commit ba153552c ("ice: Remove redundant
pci_enable_pcie_error_reporting()")
https://git.yoctoproject.org/linux-yocto/commit/?h=ba153552c
* commit 680ee0456a ("net: invert the netdevice.h vs xdp.h dependency")
https://git.yoctoproject.org/linux-yocto/commit/?h=680ee0456a
ice:
* commit ac73d4bf2 ("net: make drivers to use SET_NETDEV_DEVLINK_PORT
to set devlink_port")
https://git.yoctoproject.org/linux-yocto/commit/?h=ac73d4bf2
* commit 226bf98055 ("net: devlink: let the core report the driver name
instead of the drivers")
https://git.yoctoproject.org/linux-yocto/commit/?h=226bf98055
* commit fb8421a9 ("devlink: remove devlink features")
https://git.yoctoproject.org/linux-yocto/commit/?h=fb8421a9
i40e:
* commit 3626a690b ("i40e: use mul_u64_u64_div_u64 for PTP frequency
calculation")
https://git.yoctoproject.org/linux-yocto/commit/?h=3626a690b
* commit ccd3bf985 ("i40e: convert .adjfreq to .adjfine")
https://git.yoctoproject.org/linux-yocto/commit/?h=ccd3bf985
igb_uio:
Cherry pick upstream commit to fix the build error.
* commit 29b1c1e4 ("linux/igb_uio: fix build with kernel 5.18+")
http://git.dpdk.org/dpdk-kmods/commit/?id=29b1c1e4
intel-opae-fpga:
* commit 1aaba11da9 ("driver core: class: remove module * from
class_create()")
https://git.yoctoproject.org/linux-yocto/commit/?h=1aaba11da9
iqvlinux:
* commit 79687789 ("PCI: Remove the deprecated "pci-dma-compat.h" API")
https://git.yoctoproject.org/linux-yocto/commit/?h=79687789
Verification:
* ice, i40e, iavf:
- installs from iso succeed on servers with ice(ntel E810-2C-QDA2
Chapman beach) and i40e hw(Intel Ethernet Controller X710) for
rt and std.
- interfaces are up and pass packets for rt and std.
- create vfs, ensure that they are picked up by the new iavf
driver and that the interface can come up and pass packets
on rt and std system.
- Check dmesg to see DDP package is loaded successfully and
the version is 1.3.30.0 for rt and std.
* Switch drivers between the OOT and in-tree drivers.
- switch to the OOT drivers
1. Add cmdline parameter multi-drivers-switch=cvl-4.0.1
2. reboot
can switch to the OOT drivers.
- switch to the in-tree drivers
1. Remove cmdline parameter multi-drivers-switch=cvl-4.0.1
2. reboot
can switch to the in-tree drivers.
* igb_uio, intel-opae-fpga, iqvlinux
Did not do the tests, it looks need docker image to do the test.
So need the test team help to do the full tests.
Story: 2011056
Task: 49672
Change-Id: I2c05dee6f35ed431e8a53d2680a3c7558f08abef
Signed-off-by: Jiping Ma <jiping.ma2@windirver.com>
(cherry picked from commit d4f8973274)
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
From 386677b4a6a41a50741b290d30cf0cc257183609 Mon Sep 17 00:00:00 2001
|
|
From: Jiping Ma <jiping.ma2@windriver.com>
|
|
Date: Mon, 18 Mar 2024 00:12:48 -0700
|
|
Subject: [PATCH 07/16] ice: drop the weight argument from netif_napi_add
|
|
|
|
This patch accommodates commit b48b89f9c189 ("net: drop the weight argument
|
|
from netif_napi_add") merged in the v6.1 development cycle, by applying a
|
|
similar change to the out-of-tree ice driver to resolve the compilation
|
|
errors encountered with the v6.6 kernel, which are listed below.
|
|
|
|
References:
|
|
* https://git.yoctoproject.org/linux-yocto/commit/?h=b48b89f9c189
|
|
|
|
Resolved compilation errors:
|
|
|
|
/src/ice_main.c:4375:3: error: too many arguments to function netif_napi_add
|
|
4375 | netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
|
|
| ^~~~~~~~~~~~~~
|
|
In file included from /usr/src/linux-headers-6.1.0-1-common/include/linux/\
|
|
etherdevice.h:21,
|
|
from /<<PKGBUILDDIR>>/src/kcompat.h:16,
|
|
from /<<PKGBUILDDIR>>/src/ice.h:7,
|
|
from /<<PKGBUILDDIR>>/src/ice_main.c:8:
|
|
/usr/src/linux-headers-6.1.0-1-common/include/linux/netdevice.h:2575:1: \
|
|
note: declared here
|
|
2575 | netif_napi_add(struct net_device *dev, struct napi_struct *napi,
|
|
|
|
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
|
---
|
|
src/ice_base.c | 3 +--
|
|
src/ice_eswitch.c | 3 +--
|
|
src/ice_main.c | 2 +-
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/ice_base.c b/src/ice_base.c
|
|
index b43752e..d9c9d42 100644
|
|
--- a/src/ice_base.c
|
|
+++ b/src/ice_base.c
|
|
@@ -127,8 +127,7 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx)
|
|
* handler here (i.e. resume, reset/rebuild, etc.)
|
|
*/
|
|
if (vsi->netdev)
|
|
- netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll,
|
|
- NAPI_POLL_WEIGHT);
|
|
+ netif_napi_add(vsi->netdev, &q_vector->napi, ice_napi_poll);
|
|
|
|
out:
|
|
/* tie q_vector and VSI together */
|
|
diff --git a/src/ice_eswitch.c b/src/ice_eswitch.c
|
|
index 6e44820..3c8f65b 100644
|
|
--- a/src/ice_eswitch.c
|
|
+++ b/src/ice_eswitch.c
|
|
@@ -330,8 +330,7 @@ static int ice_eswitch_setup_reprs(struct ice_pf *pf)
|
|
if (max_vsi_num < vsi->vsi_num)
|
|
max_vsi_num = vsi->vsi_num;
|
|
|
|
- netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi, ice_napi_poll,
|
|
- NAPI_POLL_WEIGHT);
|
|
+ netif_napi_add(vf->repr->netdev, &vf->repr->q_vector->napi, ice_napi_poll);
|
|
|
|
netif_keep_dst(vf->repr->netdev);
|
|
}
|
|
diff --git a/src/ice_main.c b/src/ice_main.c
|
|
index 40b01ae..96ac8c3 100644
|
|
--- a/src/ice_main.c
|
|
+++ b/src/ice_main.c
|
|
@@ -4373,7 +4373,7 @@ static void ice_napi_add(struct ice_vsi *vsi)
|
|
|
|
ice_for_each_q_vector(vsi, v_idx)
|
|
netif_napi_add(vsi->netdev, &vsi->q_vectors[v_idx]->napi,
|
|
- ice_napi_poll, NAPI_POLL_WEIGHT);
|
|
+ ice_napi_poll);
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.43.0
|
|
|