[dpdk-stable] patch 'net/i40e: relax barrier in Tx' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 3e387d591e7b421397349d772ff55cf52ebe9c0b Mon Sep 17 00:00:00 2001
From: Gavin Hu <gavin.hu at arm.com>
Date: Wed, 12 Feb 2020 13:56:21 +0800
Subject: [PATCH] net/i40e: relax barrier in Tx

[ upstream commit bade47a7570b99cf77e71343cf43efed66ab8307 ]

To keep ordering of mixed accesses, rte_cio is sufficient.
The rte_io barrier inside the I40E_PCI_REG_WRITE is overkill.[1]

[1] http://inbox.dpdk.org/dev/CALBAE1M-ezVWCjqCZDBw+MMDEC4O9
qf0Kpn89EMdGDajepKoZQ at mail.gmail.com

Fixes: 4861cde46116 ("i40e: new poll mode driver")

Signed-off-by: Gavin Hu <gavin.hu at arm.com>
Reviewed-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/net/i40e/i40e_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 0ae47b807b..9a1eab4653 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1248,7 +1248,8 @@ end_of_tx:
 		   (unsigned) txq->port_id, (unsigned) txq->queue_id,
 		   (unsigned) tx_id, (unsigned) nb_tx);
 
-	I40E_PCI_REG_WRITE(txq->qtx_tail, tx_id);
+	rte_cio_wmb();
+	I40E_PCI_REG_WRITE_RELAXED(txq->qtx_tail, tx_id);
 	txq->tx_tail = tx_id;
 
 	return nb_tx;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.563316099 +0100
+++ 0019-net-i40e-relax-barrier-in-Tx.patch	2020-05-19 13:56:18.183501171 +0100
@@ -1,8 +1,10 @@
-From bade47a7570b99cf77e71343cf43efed66ab8307 Mon Sep 17 00:00:00 2001
+From 3e387d591e7b421397349d772ff55cf52ebe9c0b Mon Sep 17 00:00:00 2001
 From: Gavin Hu <gavin.hu at arm.com>
 Date: Wed, 12 Feb 2020 13:56:21 +0800
 Subject: [PATCH] net/i40e: relax barrier in Tx
 
+[ upstream commit bade47a7570b99cf77e71343cf43efed66ab8307 ]
+
 To keep ordering of mixed accesses, rte_cio is sufficient.
 The rte_io barrier inside the I40E_PCI_REG_WRITE is overkill.[1]
 
@@ -10,7 +12,6 @@
 qf0Kpn89EMdGDajepKoZQ at mail.gmail.com
 
 Fixes: 4861cde46116 ("i40e: new poll mode driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Gavin Hu <gavin.hu at arm.com>
 Reviewed-by: Jerin Jacob <jerinj at marvell.com>
@@ -19,7 +20,7 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
-index f6d23c9fb6..fdc1e00355 100644
+index 0ae47b807b..9a1eab4653 100644
 --- a/drivers/net/i40e/i40e_rxtx.c
 +++ b/drivers/net/i40e/i40e_rxtx.c
 @@ -1248,7 +1248,8 @@ end_of_tx: