From 982aa8af523bd96e990107e03c4089b4efcf1927 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Wed, 11 Apr 2018 13:30:12 +0100 Subject: [PATCH] bus/dpaa: use iova2virt instead of memseg iteration Reduce dependency on internal details of EAL memory subsystem, and simplify code. Signed-off-by: Anatoly Burakov Tested-by: Santosh Shukla Tested-by: Hemant Agrawal Tested-by: Gowrishankar Muthukrishnan --- drivers/bus/dpaa/rte_dpaa_bus.h | 12 +----------- drivers/mempool/dpaa/Makefile | 3 +++ drivers/mempool/dpaa/meson.build | 3 +++ drivers/net/dpaa/Makefile | 3 +++ 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 718701b178..89aeac2d18 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -98,17 +98,7 @@ struct dpaa_portal { /* TODO - this is costly, need to write a fast coversion routine */ static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr) { - const struct rte_memseg *memseg = rte_eal_get_physmem_layout(); - int i; - - for (i = 0; i < RTE_MAX_MEMSEG && memseg[i].addr != NULL; i++) { - if (paddr >= memseg[i].iova && paddr < - memseg[i].iova + memseg[i].len) - return (uint8_t *)(memseg[i].addr) + - (paddr - memseg[i].iova); - } - - return NULL; + return rte_mem_iova2virt(paddr); } /** diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile index 4c0d7aaa1f..da8da1e908 100644 --- a/drivers/mempool/dpaa/Makefile +++ b/drivers/mempool/dpaa/Makefile @@ -22,6 +22,9 @@ EXPORT_MAP := rte_mempool_dpaa_version.map # Lbrary version LIBABIVER := 1 +# depends on dpaa bus which uses experimental API +CFLAGS += -DALLOW_EXPERIMENTAL_API + # all source are stored in SRCS-y # SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build index 08423c218d..9163b3db31 100644 --- a/drivers/mempool/dpaa/meson.build +++ b/drivers/mempool/dpaa/meson.build @@ -7,3 +7,6 @@ endif deps += ['bus_dpaa'] sources = files('dpaa_mempool.c') + +# depends on dpaa bus which uses experimental API +allow_experimental_apis = true diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile index 9c2a5ea834..d7a0a50c55 100644 --- a/drivers/net/dpaa/Makefile +++ b/drivers/net/dpaa/Makefile @@ -27,6 +27,9 @@ EXPORT_MAP := rte_pmd_dpaa_version.map LIBABIVER := 1 +# depends on dpaa bus which uses experimental API +CFLAGS += -DALLOW_EXPERIMENTAL_API + # Interfaces with DPDK SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c -- 2.20.1