[dpdk-stable] patch 'net/dpaa2: fix IOVA conversion for congestion memory' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From d47f987a3ad944c98079141879bf362f91cc180c Mon Sep 17 00:00:00 2001
From: Nipun Gupta <nipun.gupta at nxp.com>
Date: Fri, 12 Oct 2018 15:34:12 +0530
Subject: [PATCH] net/dpaa2: fix IOVA conversion for congestion memory

[ upstream commit 543dbfec6e85ede9943679cc9b6e99319111256e ]

The code was incorrectly using the Virtual mode, whent
the IOVA mode was set as Physical.

Fixes: 5ae1edff6895 ("dpaa2: prepare for 32-bit build")

Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
---
 drivers/net/dpaa2/dpaa2_ethdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index c5047367a..6f6baba8e 100644
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -570,5 +570,6 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
 		cong_notif_cfg.threshold_exit = CONG_EXIT_TX_THRESHOLD;
 		cong_notif_cfg.message_ctx = 0;
-		cong_notif_cfg.message_iova = (size_t)dpaa2_q->cscn;
+		cong_notif_cfg.message_iova =
+				(size_t)DPAA2_VADDR_TO_IOVA(dpaa2_q->cscn);
 		cong_notif_cfg.dest_cfg.dest_type = DPNI_DEST_NONE;
 		cong_notif_cfg.notification_mode =
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.913911515 +0000
+++ 0073-net-dpaa2-fix-IOVA-conversion-for-congestion-memory.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,13 +1,14 @@
-From 543dbfec6e85ede9943679cc9b6e99319111256e Mon Sep 17 00:00:00 2001
+From d47f987a3ad944c98079141879bf362f91cc180c Mon Sep 17 00:00:00 2001
 From: Nipun Gupta <nipun.gupta at nxp.com>
 Date: Fri, 12 Oct 2018 15:34:12 +0530
 Subject: [PATCH] net/dpaa2: fix IOVA conversion for congestion memory
 
+[ upstream commit 543dbfec6e85ede9943679cc9b6e99319111256e ]
+
 The code was incorrectly using the Virtual mode, whent
 the IOVA mode was set as Physical.
 
 Fixes: 5ae1edff6895 ("dpaa2: prepare for 32-bit build")
-Cc: stable at dpdk.org
 
 Signed-off-by: Nipun Gupta <nipun.gupta at nxp.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
-index 880034fcf..9ae326023 100644
+index c5047367a..6f6baba8e 100644
 --- a/drivers/net/dpaa2/dpaa2_ethdev.c
 +++ b/drivers/net/dpaa2/dpaa2_ethdev.c
-@@ -569,5 +569,6 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
+@@ -570,5 +570,6 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
  		cong_notif_cfg.threshold_exit = CONG_EXIT_TX_THRESHOLD;
  		cong_notif_cfg.message_ctx = 0;
 -		cong_notif_cfg.message_iova = (size_t)dpaa2_q->cscn;