Merge "Debian: Upgrade ice, i40e, iavf drivers to bundle 27.1"
This commit is contained in:
Zuul
Gerrit Code Review
commit
8b64cfaabe
|
|
@ -1,3 +1,10 @@
|
|||
i40e (2.18.9-1) unstable; urgency=medium
|
||||
|
||||
* Update iavf driver to 4.4.2, and that dictates the upgrade of the i40e
|
||||
driver. We select the version 2.18.9-1 that comes from bundle 27.1.
|
||||
|
||||
-- Jiping Ma <jiping.ma2@windriver.com> Tue, 12 Apr 2022 13:09:50 +0800
|
||||
|
||||
i40e (2.17.4-1) unstable; urgency=medium
|
||||
|
||||
* Initial release
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
debver: 2.17.4
|
||||
debver: 2.18.9
|
||||
debname: i40e
|
||||
dl_path:
|
||||
name: i40e-2.17.4.tar.gz
|
||||
name: i40e-2.18.9.tar.gz
|
||||
url: "https://sourceforge.net/projects/e1000/files/i40e%20stable/\
|
||||
2.17.4/i40e-2.17.4.tar.gz/download"
|
||||
md5sum: 25101f2fa1fdb7264b5e7add8ff70917
|
||||
2.18.9/i40e-2.18.9.tar.gz/download"
|
||||
md5sum: f8caf2c9123d83b538812927c1460450
|
||||
sha256sum: 68184b31fd1f1c7b61ce42c0c5bff25d14bc08d95676b84ec115ba893776d720
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
iavf (4.4.2-1) unstable; urgency=medium
|
||||
|
||||
* Update ICE driver to 1.8.3, and that dictates the upgrade of the iavf
|
||||
driver. We select the version 4.4.2-1 that comes from bundle 27.1.
|
||||
|
||||
-- Jiping Ma <jiping.ma2@windriver.com> Tue, 12 Apr 2022 14:30:42 +0800
|
||||
|
||||
iavf (4.3.19-1) unstable; urgency=medium
|
||||
|
||||
* Initial release
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
debver: 4.3.19
|
||||
debver: 4.4.2
|
||||
debname: iavf
|
||||
dl_path:
|
||||
name: iavf-4.3.19.tar.gz
|
||||
name: iavf-4.4.2.tar.gz
|
||||
url: "https://sourceforge.net/projects/e1000/files/iavf%20stable/\
|
||||
4.3.19/iavf-4.3.19.tar.gz/download"
|
||||
md5sum: c1c47a0183a56a6f0ae05791df6cfc82
|
||||
4.4.2/iavf-4.4.2.tar.gz/download"
|
||||
md5sum: 131fea2266c82ffd6bcfaac0a0568e90
|
||||
sha256sum: 9db3dd700b3fd770ff207968a9e230fd45f1b36d6ae61ebf2f468f4822a48a96
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
ice (1.8.3-1) unstable; urgency=medium
|
||||
|
||||
* Update ICE driver to 1.8.3-1 to support the Intel Logan Beach NIC
|
||||
(E810-CQDA2T), which comes from bundle 27.1.
|
||||
|
||||
-- Jiping Ma <jiping.ma2@windriver.com> Thu, 12 Apr 2022 9:42:39 +0800
|
||||
|
||||
ice (1.7.16-1) unstable; urgency=medium
|
||||
|
||||
* Initial release
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 2c0df5cef9bfdeb934102d18df38e4024381298f Mon Sep 17 00:00:00 2001
|
||||
From 722c51d207ea30388dfc63cec635e1d3e7d9d681 Mon Sep 17 00:00:00 2001
|
||||
From: "M. Vefa Bicakci" <vefa.bicakci@windriver.com>
|
||||
Date: Fri, 14 Jan 2022 17:50:39 -0500
|
||||
Subject: [PATCH] ice_main, ice_lib: Use irq_update_affinity_hint
|
||||
|
|
@ -23,16 +23,18 @@ And the i40e and iavf patches are accessible at:
|
|||
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0f9744f4ed539f2e847d7ed41993b243e3ba5cff
|
||||
|
||||
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
||||
[jm: Adapted the patch for context changes.]
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
---
|
||||
src/ice_lib.c | 2 +-
|
||||
src/ice_main.c | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/ice_lib.c b/src/ice_lib.c
|
||||
index 889972052be7..6e50a9dc9ef4 100644
|
||||
index 034a064..313273f 100644
|
||||
--- a/src/ice_lib.c
|
||||
+++ b/src/ice_lib.c
|
||||
@@ -2883,7 +2883,7 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)
|
||||
@@ -2900,7 +2900,7 @@ void ice_vsi_free_irq(struct ice_vsi *vsi)
|
||||
irq_set_affinity_notifier(irq_num, NULL);
|
||||
|
||||
/* clear the affinity_mask in the IRQ descriptor */
|
||||
|
|
@ -42,10 +44,10 @@ index 889972052be7..6e50a9dc9ef4 100644
|
|||
devm_free_irq(ice_pf_to_dev(pf), irq_num, vsi->q_vectors[i]);
|
||||
}
|
||||
diff --git a/src/ice_main.c b/src/ice_main.c
|
||||
index 97e754bc5e11..802d4912a574 100644
|
||||
index e00d7f8..ca761bd 100644
|
||||
--- a/src/ice_main.c
|
||||
+++ b/src/ice_main.c
|
||||
@@ -3384,8 +3384,8 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)
|
||||
@@ -3417,8 +3417,8 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)
|
||||
irq_set_affinity_notifier(irq_num, affinity_notify);
|
||||
}
|
||||
|
||||
|
|
@ -56,8 +58,8 @@ index 97e754bc5e11..802d4912a574 100644
|
|||
}
|
||||
|
||||
vsi->irqs_ready = true;
|
||||
@@ -3397,7 +3397,7 @@ free_q_irqs:
|
||||
irq_num = pf->msix_entries[base + vector].vector;
|
||||
@@ -3430,7 +3430,7 @@ free_q_irqs:
|
||||
irq_num = ice_get_irq_num(pf, base + vector);
|
||||
if (!IS_ENABLED(CONFIG_RFS_ACCEL))
|
||||
irq_set_affinity_notifier(irq_num, NULL);
|
||||
- irq_set_affinity_hint(irq_num, NULL);
|
||||
|
|
@ -66,5 +68,5 @@ index 97e754bc5e11..802d4912a574 100644
|
|||
}
|
||||
return err;
|
||||
--
|
||||
2.29.2
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
From a25ae52b1381527b89a61e0ed0c34d5fac6ffca4 Mon Sep 17 00:00:00 2001
|
||||
From: Jiping Ma <jiping.ma2@windriver.com>
|
||||
Date: Tue, 24 Aug 2021 00:30:02 -0700
|
||||
Subject: [PATCH] ice_xsk: Avoid dependency on napi_busy_loop with PREEMPT_RT
|
||||
|
||||
This commit fixes the following error encountered when compiling the ice
|
||||
device driver against PREEMPT_RT-enabled kernels:
|
||||
|
||||
error: implicit declaration of function 'napi_busy_loop'
|
||||
|
||||
This error is encountered, because, with recent kernels, defining
|
||||
CONFIG_PREEMPT_RT unsets the CONFIG_NET_RX_BUSY_POLL kernel
|
||||
configuration option, which in turn causes the napi_busy_loop function
|
||||
to not be defined.
|
||||
|
||||
The fix implemented in this patch was confirmed to be correct by
|
||||
consulting colleagues at Intel.
|
||||
|
||||
Signed-off-by: Jiping Ma <jiping.ma2@windriver.com>
|
||||
[mvb: Update commit message.]
|
||||
Signed-off-by: M. Vefa Bicakci <vefa.bicakci@windriver.com>
|
||||
---
|
||||
src/ice_xsk.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/ice_xsk.c b/src/ice_xsk.c
|
||||
index 43012bb9b115..795cdba3d5c1 100644
|
||||
--- a/src/ice_xsk.c
|
||||
+++ b/src/ice_xsk.c
|
||||
@@ -1302,12 +1302,14 @@ int ice_xsk_async_xmit(struct net_device *netdev, u32 queue_id)
|
||||
*/
|
||||
q_vector = ring->q_vector;
|
||||
if (!napi_if_scheduled_mark_missed(&q_vector->napi)) {
|
||||
+#ifdef CONFIG_NET_RX_BUSY_POLL
|
||||
if (ice_ring_ch_enabled(vsi->rx_rings[queue_id]) &&
|
||||
!ice_vsi_pkt_inspect_opt_ena(vsi))
|
||||
#define ICE_BUSY_POLL_BUDGET 8
|
||||
napi_busy_loop(q_vector->napi.napi_id, NULL, NULL,
|
||||
false, ICE_BUSY_POLL_BUDGET);
|
||||
else
|
||||
+#endif
|
||||
ice_trigger_sw_intr(&vsi->back->hw, q_vector);
|
||||
}
|
||||
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
0001-ice_xsk-Avoid-dependency-on-napi_busy_loop-with-PREE.patch
|
||||
0002-ice_main-ice_lib-Use-irq_update_affinity_hint.patch
|
||||
0001-ice_main-ice_lib-Use-irq_update_affinity_hint.patch
|
||||
0001-intel-ice-pass-linux-common-header-to-check_aux_bus.patch
|
||||
|
|
|
|||
|
|
@ -66,6 +66,5 @@ ifeq ($(WITH_MOD_SIGN),1)
|
|||
endif
|
||||
|
||||
override_dh_auto_build:
|
||||
unzip *.zip
|
||||
unzip -d ice_comms ice_comms*.zip
|
||||
dh_auto_build -D ./src
|
||||
|
|
|
|||
|
|
@ -1,18 +1,19 @@
|
|||
---
|
||||
debver: 1.7.16
|
||||
debver: 1.8.3
|
||||
debname: ice
|
||||
dl_path:
|
||||
name: ice-1.7.16.tar.gz
|
||||
name: ice-1.8.3.tar.gz
|
||||
url: "https://sourceforge.net/projects/e1000/files/ice%20stable/\
|
||||
1.7.16/ice-1.7.16.tar.gz"
|
||||
md5sum: ee6880350a799f0337914c33f1b5c8c0
|
||||
1.8.3/ice-1.8.3.tar.gz"
|
||||
md5sum: 9f14e96c6c807a5e1a57fb9075c85662
|
||||
sha256sum: 180eaec1a644c1803d85df121575878e9291d583f926dec1ca7f1f4798f7e54c
|
||||
dl_files:
|
||||
800-Series-DDP-Comms-Package-1.3.31.0.zip:
|
||||
ice_comms-1.3.35.0.zip:
|
||||
topdir: null
|
||||
url: "https://downloadmirror.intel.com/713853/\
|
||||
800%20Series%20DDP%20Comms%20Package%201.3.31.0.zip"
|
||||
md5sum: d0d838120db7784f0419cd73d481aab3
|
||||
sha256sum: 995375348a255a5425afe38676881d13c478747a07feb30e9bb2841b25e1bbd9
|
||||
url: "https://downloadmirror.intel.com/727568/\
|
||||
ice_comms-1.3.35.0.zip"
|
||||
md5sum: ee79feecf555fa50d26dfc7c07879e41
|
||||
sha256sum: 4bd0cc87784747f799e4600a54ec3710f006a89a0268efa201f30cb34a731908
|
||||
revision:
|
||||
dist: $STX_DIST
|
||||
PKG_GITREVCOUNT: true
|
||||
|
|
|
|||
Loading…
Reference in New Issue