[dpdk-stable] patch 'net/ice: fix queue MSI-X interrupt binding' has been queued to stable release 19.11.1

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Feb 27 10:33:44 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From bbf8f4015138f24afcb828e95ec1e0cd5da78391 Mon Sep 17 00:00:00 2001
From: Tao Zhu <taox.zhu at intel.com>
Date: Wed, 19 Feb 2020 18:17:12 +0800
Subject: [PATCH] net/ice: fix queue MSI-X interrupt binding

[ upstream commit 8b0add355f4a38aefc272c995b949f1fe6f1a512 ]

Operator '<<' should be used instead of '<' for shifting value to be
set in MSI-X configuration register.

Old code adds 1 on even MSI-X interrupt vector index used by queue,
resulting in interrupt mapping error.

Fixes: 65dfc889d86b ("net/ice: support Rx queue interruption")

Signed-off-by: Tao Zhu <taox.zhu at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 94a8277688..52cd20ed9e 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2599,9 +2599,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
 	for (i = 0; i < nb_queue; i++) {
 		/*do actual bind*/
 		val = (msix_vect & QINT_RQCTL_MSIX_INDX_M) |
-		      (0 < QINT_RQCTL_ITR_INDX_S) | QINT_RQCTL_CAUSE_ENA_M;
+		      (0 << QINT_RQCTL_ITR_INDX_S) | QINT_RQCTL_CAUSE_ENA_M;
 		val_tx = (msix_vect & QINT_TQCTL_MSIX_INDX_M) |
-			 (0 < QINT_TQCTL_ITR_INDX_S) | QINT_TQCTL_CAUSE_ENA_M;
+			 (0 << QINT_TQCTL_ITR_INDX_S) | QINT_TQCTL_CAUSE_ENA_M;
 
 		PMD_DRV_LOG(INFO, "queue %d is binding to vect %d",
 			    base_queue + i, msix_vect);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.595800836 +0000
+++ 0024-net-ice-fix-queue-MSI-X-interrupt-binding.patch	2020-02-27 09:31:55.747945962 +0000
@@ -1,8 +1,10 @@
-From 8b0add355f4a38aefc272c995b949f1fe6f1a512 Mon Sep 17 00:00:00 2001
+From bbf8f4015138f24afcb828e95ec1e0cd5da78391 Mon Sep 17 00:00:00 2001
 From: Tao Zhu <taox.zhu at intel.com>
 Date: Wed, 19 Feb 2020 18:17:12 +0800
 Subject: [PATCH] net/ice: fix queue MSI-X interrupt binding
 
+[ upstream commit 8b0add355f4a38aefc272c995b949f1fe6f1a512 ]
+
 Operator '<<' should be used instead of '<' for shifting value to be
 set in MSI-X configuration register.
 
@@ -10,7 +12,6 @@
 resulting in interrupt mapping error.
 
 Fixes: 65dfc889d86b ("net/ice: support Rx queue interruption")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tao Zhu <taox.zhu at intel.com>
 Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -19,10 +20,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
-index 8e9369e0a8..85ef83e926 100644
+index 94a8277688..52cd20ed9e 100644
 --- a/drivers/net/ice/ice_ethdev.c
 +++ b/drivers/net/ice/ice_ethdev.c
-@@ -2605,9 +2605,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
+@@ -2599,9 +2599,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
  	for (i = 0; i < nb_queue; i++) {
  		/*do actual bind*/
  		val = (msix_vect & QINT_RQCTL_MSIX_INDX_M) |


More information about the stable mailing list