[dpdk-stable] patch 'bus/fslmc: fix dpio close' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/30/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 11222d2fd839b297673c3ef27286c393d7ef5a01 Mon Sep 17 00:00:00 2001
From: Rohit Raj <rohit.raj at nxp.com>
Date: Tue, 28 Jul 2020 21:54:59 +0530
Subject: [PATCH] bus/fslmc: fix dpio close

[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ]

The current state of the DPIO object should be checked
before trying to close/disable the object.

Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")

Signed-off-by: Rohit Raj <rohit.raj at nxp.com>
Acked-by: Sachin Saxena <sachin.saxena at oss.nxp.com>
---
 drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index 3ca3ae4f51..9c09c69fe9 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -546,8 +546,13 @@ dpaa2_create_dpio_device(int vdev_fd,
 
 err:
 	if (dpio_dev->dpio) {
-		dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
-		dpio_close(dpio_dev->dpio, CMD_PRI_LOW,  dpio_dev->token);
+		if (dpio_dev->token) {
+			dpio_disable(dpio_dev->dpio, CMD_PRI_LOW,
+				     dpio_dev->token);
+			dpio_close(dpio_dev->dpio, CMD_PRI_LOW,
+				   dpio_dev->token);
+		}
+
 		rte_free(dpio_dev->dpio);
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:15.122287515 +0000
+++ 0108-bus-fslmc-fix-dpio-close.patch	2020-10-28 10:35:11.664832379 +0000
@@ -1,13 +1,14 @@
-From ba156cdf70f20ec5321592fe4595ab8f9ae343ec Mon Sep 17 00:00:00 2001
+From 11222d2fd839b297673c3ef27286c393d7ef5a01 Mon Sep 17 00:00:00 2001
 From: Rohit Raj <rohit.raj at nxp.com>
 Date: Tue, 28 Jul 2020 21:54:59 +0530
 Subject: [PATCH] bus/fslmc: fix dpio close
 
+[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ]
+
 The current state of the DPIO object should be checked
 before trying to close/disable the object.
 
 Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")
-Cc: stable at dpdk.org
 
 Signed-off-by: Rohit Raj <rohit.raj at nxp.com>
 Acked-by: Sachin Saxena <sachin.saxena at oss.nxp.com>
@@ -16,10 +17,10 @@
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
-index 97be761164..b0055b1644 100644
+index 3ca3ae4f51..9c09c69fe9 100644
 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
 +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
-@@ -528,8 +528,13 @@ dpaa2_create_dpio_device(int vdev_fd,
+@@ -546,8 +546,13 @@ dpaa2_create_dpio_device(int vdev_fd,
  
  err:
  	if (dpio_dev->dpio) {
@@ -32,9 +33,9 @@
 +				   dpio_dev->token);
 +		}
 +
- 		rte_free(dpio_dev->eqresp);
  		rte_free(dpio_dev->dpio);
  	}
+ 
 -- 
 2.20.1