[dpdk-stable] patch 'net/e1000: fix port hotplug for multi-process' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.9

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/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/5eca31e8f9cc8c091742086c1c0866b8c49c4b3d

Thanks.

Kevin.

---
>From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Wed, 29 Apr 2020 14:37:24 +0800
Subject: [PATCH] net/e1000: fix port hotplug for multi-process

[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]

Enable detach device on secondary process.

Fixes: b9eee2cb8c29 ("e1000: support port hotplug")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Tested-by: Jianwei Mei <jianweix.mei at intel.com>
Reviewed-by: Jeff Guo <jia.guo at intel.com>
---
 drivers/net/e1000/em_ethdev.c  | 2 +-
 drivers/net/e1000/igb_ethdev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c
index 28637c4945..3f061e8a92 100644
--- a/drivers/net/e1000/em_ethdev.c
+++ b/drivers/net/e1000/em_ethdev.c
@@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	if (adapter->stopped == 0)
diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 2c1f2314e8..dfd16d4049 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -924,5 +924,5 @@ eth_igb_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
 
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return -EPERM;
+		return 0;
 
 	if (adapter->stopped == 0)
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:53.832297345 +0100
+++ 0055-net-e1000-fix-port-hotplug-for-multi-process.patch	2020-06-05 19:20:50.868039495 +0100
@@ -1 +1 @@
-From 3a19eeb0c3329905fbb927fdbac90e548061130d Mon Sep 17 00:00:00 2001
+From 5eca31e8f9cc8c091742086c1c0866b8c49c4b3d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3a19eeb0c3329905fbb927fdbac90e548061130d ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 188cda3508..902b1cdca0 100644
+index 28637c4945..3f061e8a92 100644
@@ -23 +24 @@
-@@ -322,5 +322,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
+@@ -321,5 +321,5 @@ eth_em_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -29 +30 @@
- 	eth_em_close(eth_dev);
+ 	if (adapter->stopped == 0)
@@ -31 +32 @@
-index 520fba8fab..a5551e8175 100644
+index 2c1f2314e8..dfd16d4049 100644
@@ -40,2 +41,2 @@
- 	eth_igb_close(eth_dev);
-@@ -1045,5 +1045,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
+ 	hw = E1000_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+@@ -1084,5 +1084,5 @@ eth_igbvf_dev_uninit(struct rte_eth_dev *eth_dev)
@@ -47 +48 @@
- 	igbvf_dev_close(eth_dev);
+ 	if (adapter->stopped == 0)