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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/10/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/426ccf271cd9611ef997b2da8760f8a82a3db7d0

Thanks.

Kevin.

---
>From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 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 ba2e28ce1f..ab0eee0e82 100644
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -532,6 +532,11 @@ 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);
+		}
+
 		free(dpio_dev->dpio);
 	}
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-05 12:38:55.091360064 +0000
+++ 0044-bus-fslmc-fix-dpio-close.patch	2020-11-05 12:38:54.244896023 +0000
@@ -1 +1 @@
-From ba156cdf70f20ec5321592fe4595ab8f9ae343ec Mon Sep 17 00:00:00 2001
+From 426ccf271cd9611ef997b2da8760f8a82a3db7d0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ba156cdf70f20ec5321592fe4595ab8f9ae343ec ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 97be761164..b0055b1644 100644
+index ba2e28ce1f..ab0eee0e82 100644
@@ -22 +23 @@
-@@ -529,6 +529,11 @@ dpaa2_create_dpio_device(int vdev_fd,
+@@ -532,6 +532,11 @@ dpaa2_create_dpio_device(int vdev_fd,
@@ -34,2 +35,2 @@
- 		rte_free(dpio_dev->eqresp);
- 		rte_free(dpio_dev->dpio);
+ 		free(dpio_dev->dpio);
+ 	}