From: David Marchand <david.march...@redhat.com>

This reverts commit 0cb86518db57d35e0abc14d6703fad561a0310e2.

The pci bus now reports DC when faced with a device bound to an unknown
driver and, in such a case, the IOVA mode is selected against physical
address availability.

As a consequence, there is no reason for this special case for Mellanox
drivers.

Fixes: 703458e19c16 ("bus/pci: consider only usable devices for IOVA mode")

Signed-off-by: David Marchand <david.march...@redhat.com>
Reviewed-by: Jerin Jacob <jer...@marvell.com>
---
 drivers/bus/pci/linux/pci.c             | 8 --------
 lib/librte_eal/common/include/rte_dev.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 33c8ea7e9..b12f10af5 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -329,9 +329,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr 
*addr)
                        dev->kdrv = RTE_KDRV_IGB_UIO;
                else if (!strcmp(driver, "uio_pci_generic"))
                        dev->kdrv = RTE_KDRV_UIO_GENERIC;
-               else if (!strcmp(driver, "mlx4_core") ||
-                               !strcmp(driver, "mlx5_core"))
-                       dev->kdrv = RTE_KDRV_NIC_MLX;
                else
                        dev->kdrv = RTE_KDRV_UNKNOWN;
        } else
@@ -591,11 +588,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv,
                break;
        }
 
-       case RTE_KDRV_NIC_MLX:
-               if ((pdrv->drv_flags & RTE_PCI_DRV_IOVA_AS_VA) == 0)
-                       iova_mode = RTE_IOVA_PA;
-               break;
-
        case RTE_KDRV_IGB_UIO:
        case RTE_KDRV_UIO_GENERIC:
                iova_mode = RTE_IOVA_PA;
diff --git a/lib/librte_eal/common/include/rte_dev.h 
b/lib/librte_eal/common/include/rte_dev.h
index 94829f6e4..c25e09e3d 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -63,7 +63,6 @@ enum rte_kernel_driver {
        RTE_KDRV_VFIO,
        RTE_KDRV_UIO_GENERIC,
        RTE_KDRV_NIC_UIO,
-       RTE_KDRV_NIC_MLX,
        RTE_KDRV_NONE,
 };
 
-- 
2.22.0

Reply via email to