[dpdk-stable] patch 'bus/pci: fix devargs on probing again' 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/03/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/f1fdd2a09fa964765c58c681a63bd1af4a58b920

Thanks.

Kevin.

---
>From f1fdd2a09fa964765c58c681a63bd1af4a58b920 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur at broadcom.com>
Date: Fri, 14 Feb 2020 12:13:53 +0530
Subject: [PATCH] bus/pci: fix devargs on probing again

[ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ]

As per the comments in this code section, since there is a matching device,
it is now its responsibility to manage the devargs we've just inserted.
But the matching device ptr's devargs is still uninitialized or not pointing
to the newest dev_args that were passed as a parameter to local_dev_probe().
This is needed particularly in the case when *probe is called again* on an
already probed device as part of adding a representor port to OVS-DPDK.

Fixes: 7e8b26650146 ("eal: fix hotplug add / remove")

Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Acked-by: Gaetan Rivet <grive at u256.net>
---
 drivers/bus/pci/linux/pci.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 9b1c7c839a..280e779155 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -379,4 +379,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
 						RTE_LOG(ERR, EAL, "Unexpected device scan at %s!\n",
 							filename);
+					else if (dev2->device.devargs !=
+						 dev->device.devargs) {
+						rte_devargs_remove(dev2->device.devargs);
+						pci_name_set(dev2);
+					}
 				}
 				free(dev);
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.572130671 +0100
+++ 0027-bus-pci-fix-devargs-on-probing-again.patch	2020-05-28 17:12:59.087556717 +0100
@@ -1 +1 @@
-From fc67ae91ebae7c48fc27a1d24e0843c50c192459 Mon Sep 17 00:00:00 2001
+From f1fdd2a09fa964765c58c681a63bd1af4a58b920 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 740a2cdad4..71b0a3053d 100644
+index 9b1c7c839a..280e779155 100644
@@ -26 +27 @@
-@@ -378,4 +378,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
+@@ -379,4 +379,9 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)