bus/pci: enhance driver pointer documentation

[dpdk.git] / drivers / bus / pci / pci_common.c

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index f8fff2c..37ab879 100644 (file)
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -207,11 +207,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
        RTE_LOG(DEBUG, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
                dev->id.device_id, dr->driver.name);
 
-       /*
-        * reference driver structure
-        * This needs to be before rte_pci_map_device(), as it enables to use
-        * driver flags for adjusting configuration.
-        */
        if (!already_probed) {
                enum rte_iova_mode dev_iova_mode;
                enum rte_iova_mode iova_mode;
@@ -247,9 +242,16 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                        return -ENOMEM;
                }
 
-               if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
+               /*
+                * Reference driver structure.
+                * This needs to be before rte_pci_map_device(), as it enables
+                * to use driver flags for adjusting configuration.
+                */
+               dev->driver = dr;
+               if (dev->driver->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
                        ret = rte_pci_map_device(dev);
                        if (ret != 0) {
+                               dev->driver = NULL;
                                rte_intr_instance_free(dev->vfio_req_intr_handle);
                                dev->vfio_req_intr_handle = NULL;
                                rte_intr_instance_free(dev->intr_handle);
@@ -257,8 +259,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                                return ret;
                        }
                }
-
-               dev->driver = dr;
        }
 
        RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%x) device: "PCI_PRI_FMT" (socket %i)\n",
@@ -271,10 +271,6 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                return ret; /* no rollback if already succeeded earlier */
        if (ret) {
                dev->driver = NULL;
-               rte_intr_instance_free(dev->vfio_req_intr_handle);
-               dev->vfio_req_intr_handle = NULL;
-               rte_intr_instance_free(dev->intr_handle);
-               dev->intr_handle = NULL;
                if ((dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) &&
                        /* Don't unmap if device is unsupported and
                         * driver needs mapped resources.
@@ -282,6 +278,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                        !(ret > 0 &&
                                (dr->drv_flags & RTE_PCI_DRV_KEEP_MAPPED_RES)))
                        rte_pci_unmap_device(dev);
+               rte_intr_instance_free(dev->vfio_req_intr_handle);
+               dev->vfio_req_intr_handle = NULL;
+               rte_intr_instance_free(dev->intr_handle);
+               dev->intr_handle = NULL;
        } else {
                dev->device.driver = &dr->driver;
        }
@@ -322,15 +322,16 @@ rte_pci_detach_dev(struct rte_pci_device *dev)
        /* clear driver structure */
        dev->driver = NULL;
        dev->device.driver = NULL;
-       rte_intr_instance_free(dev->intr_handle);
-       dev->intr_handle = NULL;
-       rte_intr_instance_free(dev->vfio_req_intr_handle);
-       dev->vfio_req_intr_handle = NULL;
 
        if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING)
                /* unmap resources for devices that use igb_uio */
                rte_pci_unmap_device(dev);
 
+       rte_intr_instance_free(dev->intr_handle);
+       dev->intr_handle = NULL;
+       rte_intr_instance_free(dev->vfio_req_intr_handle);
+       dev->vfio_req_intr_handle = NULL;
+
        return 0;
 }