doc: fix typo in mlx5 guide

[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 41f8fc2..704b9d7 100644 (file)
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -243,7 +243,7 @@ rte_pci_detach_dev(struct rte_pci_device *dev)
 
 /*
  * If vendor/device ID match, call the probe() function of all
- * registered driver for the given device. Return -1 if initialization
+ * registered driver for the given device. Return < 0 if initialization
  * failed, return 1 if no driver is found for this device.
  */
 static int
@@ -253,13 +253,13 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
        int rc = 0;
 
        if (dev == NULL)
-               return -1;
+               return -EINVAL;
 
        FOREACH_DRIVER_ON_PCIBUS(dr) {
                rc = rte_pci_probe_one_driver(dr, dev);
                if (rc < 0)
                        /* negative value is an error */
-                       return -1;
+                       return rc;
                if (rc > 0)
                        /* positive value means driver doesn't support it */
                        continue;
@@ -522,11 +522,58 @@ pci_unplug(struct rte_device *dev)
        ret = rte_pci_detach_dev(pdev);
        if (ret == 0) {
                rte_pci_remove_device(pdev);
+               rte_devargs_remove(dev->devargs);
                free(pdev);
        }
        return ret;
 }
 
+static int
+pci_dma_map(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+       struct rte_pci_device *pdev = RTE_DEV_TO_PCI(dev);
+
+       if (!pdev || !pdev->driver) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+       if (pdev->driver->dma_map)
+               return pdev->driver->dma_map(pdev, addr, iova, len);
+       /**
+        *  In case driver don't provides any specific mapping
+        *  try fallback to VFIO.
+        */
+       if (pdev->kdrv == RTE_KDRV_VFIO)
+               return rte_vfio_container_dma_map
+                               (RTE_VFIO_DEFAULT_CONTAINER_FD, (uintptr_t)addr,
+                                iova, len);
+       rte_errno = ENOTSUP;
+       return -1;
+}
+
+static int
+pci_dma_unmap(struct rte_device *dev, void *addr, uint64_t iova, size_t len)
+{
+       struct rte_pci_device *pdev = RTE_DEV_TO_PCI(dev);
+
+       if (!pdev || !pdev->driver) {
+               rte_errno = EINVAL;
+               return -1;
+       }
+       if (pdev->driver->dma_unmap)
+               return pdev->driver->dma_unmap(pdev, addr, iova, len);
+       /**
+        *  In case driver don't provides any specific mapping
+        *  try fallback to VFIO.
+        */
+       if (pdev->kdrv == RTE_KDRV_VFIO)
+               return rte_vfio_container_dma_unmap
+                               (RTE_VFIO_DEFAULT_CONTAINER_FD, (uintptr_t)addr,
+                                iova, len);
+       rte_errno = ENOTSUP;
+       return -1;
+}
+
 struct rte_pci_bus rte_pci_bus = {
        .bus = {
                .scan = rte_pci_scan,
@@ -535,6 +582,8 @@ struct rte_pci_bus rte_pci_bus = {
                .plug = pci_plug,
                .unplug = pci_unplug,
                .parse = pci_parse,
+               .dma_map = pci_dma_map,
+               .dma_unmap = pci_dma_unmap,
                .get_iommu_class = rte_pci_get_iommu_class,
                .dev_iterate = rte_pci_dev_iterate,
                .hot_unplug_handler = pci_hot_unplug_handler,