bus/pci: copy new id for inserted device on Linux

When a device is inserted into an existing BDF slot
that has not been probed, we must overwrite the old
PCI ID with the ID of the new function. Otherwise
we may not probe the function with the correct driver,
if at all.

Signed-off-by: Jim Harris <james.r.harris@intel.com>

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index bf275947f4338f71553e1b6ed892c33cbfe8a44a..619d209ad21b18defeea30a522e9b86df67445aa 100644 (file)
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -352,6 +352,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
                                if (!rte_dev_is_probed(&dev2->device)) {
                                        dev2->kdrv = dev->kdrv;
                                        dev2->max_vfs = dev->max_vfs;
+                                       dev2->id = dev->id;
                                        pci_name_set(dev2);
                                        memmove(dev2->mem_resource,
                                                dev->mem_resource,
@@ -365,7 +366,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
                                         * need to do anything here unless...
                                         **/
                                        if (dev2->kdrv != dev->kdrv ||
-                                               dev2->max_vfs != dev->max_vfs)
+                                               dev2->max_vfs != dev->max_vfs ||
+                                               memcmp(&dev2->id, &dev->id, sizeof(dev2->id)))
                                                /*
                                                 * This should not happens.
                                                 * But it is still possible if