[dpdk-dev] [PATCH v1 7/8] bus/pci: implement IOVA mode getter

[Gaetan Rivet <gaetan.rivet@6wind.com>]

Implement the ctrl operator for the IOVA mode configuration item.
The previous functionality is kept identical, only the new control
framework is used.

All operators are made private as there is no reason to expose them.

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
 drivers/bus/pci/bsd/pci.c             |  9 ++++++---
 drivers/bus/pci/include/rte_bus_pci.h | 11 -----------
 drivers/bus/pci/linux/pci.c           | 20 +++++++++++++-------
 drivers/bus/pci/pci_common.c          |  4 +++-
 drivers/bus/pci/private.h             | 13 +++++++++++++
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c
index 753d914..ffb159f 100644
--- a/drivers/bus/pci/bsd/pci.c
+++ b/drivers/bus/pci/bsd/pci.c
@@ -407,11 +407,14 @@ rte_pci_scan(void)
 /*
  * Get iommu class of PCI devices on the bus.
  */
-enum rte_iova_mode
-rte_pci_get_iommu_class(void)
+int
+pci_iommu_class_get(void *_mode)
 {
+	enum rte_iova_mode *mode = _mode;
+
 	/* Supports only RTE_KDRV_NIC_UIO */
-	return RTE_IOVA_PA;
+	*mode = RTE_IOVA_PA;
+	return 0;
 }
 
 int
diff --git a/drivers/bus/pci/include/rte_bus_pci.h b/drivers/bus/pci/include/rte_bus_pci.h
index f662705..a120b70 100644
--- a/drivers/bus/pci/include/rte_bus_pci.h
+++ b/drivers/bus/pci/include/rte_bus_pci.h
@@ -205,17 +205,6 @@ int
 rte_pci_match(const struct rte_pci_driver *pci_drv,
 	      const struct rte_pci_device *pci_dev);
 
-
-/**
- * Get iommu class of PCI devices on the bus.
- * And return their preferred iova mapping mode.
- *
- * @return
- *   - enum rte_iova_mode.
- */
-enum rte_iova_mode
-rte_pci_get_iommu_class(void);
-
 /**
  * Map the PCI device resources in user space virtual memory address
  *
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 422579f..b711cdf 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -553,17 +553,20 @@ pci_one_device_has_iova_va(void)
 /*
  * Get iommu class of PCI devices on the bus.
  */
-enum rte_iova_mode
-rte_pci_get_iommu_class(void)
+int
+pci_iommu_class_get(void *_mode)
 {
+	enum rte_iova_mode *mode = _mode;
 	bool is_bound;
 	bool is_vfio_noiommu_enabled = true;
 	bool has_iova_va;
 	bool is_bound_uio;
 
 	is_bound = pci_one_device_is_bound();
-	if (!is_bound)
-		return RTE_IOVA_DC;
+	if (!is_bound) {
+		*mode = RTE_IOVA_DC;
+		return 0;
+	}
 
 	has_iova_va = pci_one_device_has_iova_va();
 	is_bound_uio = pci_one_device_bound_uio();
@@ -572,8 +575,10 @@ rte_pci_get_iommu_class(void)
 					true : false;
 #endif
 
-	if (has_iova_va && !is_bound_uio && !is_vfio_noiommu_enabled)
-		return RTE_IOVA_VA;
+	if (has_iova_va && !is_bound_uio && !is_vfio_noiommu_enabled) {
+		*mode = RTE_IOVA_VA;
+		return 0;
+	}
 
 	if (has_iova_va) {
 		RTE_LOG(WARNING, EAL, "Some devices want iova as va but pa will be used because.. ");
@@ -583,7 +588,8 @@ rte_pci_get_iommu_class(void)
 			RTE_LOG(WARNING, EAL, "few device bound to UIO\n");
 	}
 
-	return RTE_IOVA_PA;
+	*mode = RTE_IOVA_PA;
+	return 0;
 }
 
 /* Read PCI config space. */
diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 358e232..bbe862b 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -550,6 +550,9 @@ static rte_bus_ctrl_t pci_ctrl_ops[][RTE_BUS_CTRL_OP_MAX] = {
 		[RTE_BUS_CTRL_GET] = pci_probe_mode_get,
 		[RTE_BUS_CTRL_SET] = pci_probe_mode_set,
 	},
+	[RTE_BUS_CTRL_IOVA_MODE] = {
+		[RTE_BUS_CTRL_GET] = pci_iommu_class_get,
+	},
 };
 
 static rte_bus_ctrl_t
@@ -571,7 +574,6 @@ struct rte_pci_bus rte_pci_bus = {
 		.plug = pci_plug,
 		.unplug = pci_unplug,
 		.parse = pci_parse,
-		.get_iommu_class = rte_pci_get_iommu_class,
 		.ctrl = pci_ctrl,
 	},
 	.probe_mode = RTE_BUS_PROBE_BLACKLIST,
diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index fdc2c81..ee13855 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -171,4 +171,17 @@ void pci_uio_free_resource(struct rte_pci_device *dev,
 int pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx,
 		struct mapped_pci_resource *uio_res, int map_idx);
 
+/**
+ * Get iommu class of PCI devices on the bus.
+ * Return their preferred iova mapping mode.
+ *
+ * @param _mode
+ *   Generic address to an (enum rte_iova_mode)
+ * @return
+ *   0 on success
+ *   !0 otherwise
+ */
+int
+pci_iommu_class_get(void *_mode);
+
 #endif /* _PCI_PRIVATE_H_ */
-- 
2.1.4