bus/pci: enhance driver pointer documentation
authorDavid Marchand <david.marchand@redhat.com>
Tue, 1 Mar 2022 10:53:54 +0000 (11:53 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Mon, 7 Mar 2022 16:46:10 +0000 (17:46 +0100)
Setting driver pointer before mapping required for write combining
support since commit 4a928ef9f611 ("bus/pci: enable write combining
during mapping").

Move comments that got separated after different changes.
Also change the condition relying on dev->driver itself.

Signed-off-by: David Marchand <david.marchand@redhat.com>
drivers/bus/pci/pci_common.c

index def372b..37ab879 100644 (file)
@@ -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);
 
        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;
        if (!already_probed) {
                enum rte_iova_mode dev_iova_mode;
                enum rte_iova_mode iova_mode;
@@ -247,9 +242,13 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                        return -ENOMEM;
                }
 
                        return -ENOMEM;
                }
 
+               /*
+                * 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;
                dev->driver = dr;
-
-               if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
+               if (dev->driver->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
                        ret = rte_pci_map_device(dev);
                        if (ret != 0) {
                                dev->driver = NULL;
                        ret = rte_pci_map_device(dev);
                        if (ret != 0) {
                                dev->driver = NULL;