[dpdk-stable] patch 'net/virtio: unmap port IO for legacy device' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 06/27/19. 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/635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe

Thanks.

Kevin Traynor

---
>From 635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Wed, 5 Jun 2019 17:43:39 +0800
Subject: [PATCH] net/virtio: unmap port IO for legacy device

[ upstream commit 535f8a109a655552b30a7cead6ffdcba3e73db29 ]

For legacy devices, we should also unmap the port IO
resource on device removal.

Fixes: b8f04520ad71 ("virtio: use PCI ioport API")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index e1c97a481..d8724566a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1717,4 +1717,6 @@ static int
 eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
 {
+	struct virtio_hw *hw = eth_dev->data->dev_private;
+
 	PMD_INIT_FUNC_TRACE();
 
@@ -1729,6 +1731,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
 	eth_dev->rx_pkt_burst = NULL;
 
-	if (eth_dev->device)
+	if (eth_dev->device) {
 		rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
+		if (!hw->modern)
+			rte_pci_ioport_unmap(VTPCI_IO(hw));
+	}
 
 	PMD_INIT_LOG(DEBUG, "dev_uninit completed");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-06-24 16:18:57.759237308 +0100
+++ 0052-net-virtio-unmap-port-IO-for-legacy-device.patch	2019-06-24 16:18:55.123429052 +0100
@@ -1 +1 @@
-From 535f8a109a655552b30a7cead6ffdcba3e73db29 Mon Sep 17 00:00:00 2001
+From 635ccd415fee13558bb92c6c9ac7c71a9e9ce8fe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 535f8a109a655552b30a7cead6ffdcba3e73db29 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index df3a218a8..a2cedcc87 100644
+index e1c97a481..d8724566a 100644
@@ -22 +23 @@
-@@ -1877,4 +1877,6 @@ static int
+@@ -1717,4 +1717,6 @@ static int
@@ -29 +30 @@
-@@ -1889,6 +1891,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -1729,6 +1731,9 @@ eth_virtio_dev_uninit(struct rte_eth_dev *eth_dev)