New upstream version 18.08

[deb_dpdk.git] / drivers / bus / dpaa / rte_dpaa_bus.h

diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h
index 718701b..15dc6a4 100644 (file)
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -15,8 +15,6 @@
 #include <of.h>
 #include <netcfg.h>
 
-#define FSL_DPAA_BUS_NAME      "FSL_DPAA_BUS"
-
 #define DPAA_MEMPOOL_OPS_NAME  "dpaa"
 
 #define DEV_TO_DPAA_DEVICE(ptr)        \
@@ -95,20 +93,35 @@ struct dpaa_portal {
        uint64_t tid;/**< Parent Thread id for this portal */
 };
 
-/* TODO - this is costly, need to write a fast coversion routine */
+/* Various structures representing contiguous memory maps */
+struct dpaa_memseg {
+       TAILQ_ENTRY(dpaa_memseg) next;
+       char *vaddr;
+       rte_iova_t iova;
+       size_t len;
+};
+
+TAILQ_HEAD(dpaa_memseg_list, dpaa_memseg);
+extern struct dpaa_memseg_list rte_dpaa_memsegs;
+
+/* Either iterate over the list of internal memseg references or fallback to
+ * EAL memseg based iova2virt.
+ */
 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);
+       struct dpaa_memseg *ms;
+
+       /* Check if the address is already part of the memseg list internally
+        * maintained by the dpaa driver.
+        */
+       TAILQ_FOREACH(ms, &rte_dpaa_memsegs, next) {
+               if (paddr >= ms->iova && paddr <
+                       ms->iova + ms->len)
+                       return RTE_PTR_ADD(ms->vaddr, (uintptr_t)(paddr - ms->iova));
        }
 
-       return NULL;
+       /* If not, Fallback to full memseg list searching */
+       return rte_mem_iova2virt(paddr);
 }
 
 /**
@@ -151,8 +164,7 @@ void dpaa_portal_finish(void *arg);
 
 /** Helper for DPAA device registration from driver (eth, crypto) instance */
 #define RTE_PMD_REGISTER_DPAA(nm, dpaa_drv) \
-RTE_INIT(dpaainitfn_ ##nm); \
-static void dpaainitfn_ ##nm(void) \
+RTE_INIT(dpaainitfn_ ##nm) \
 {\
        (dpaa_drv).driver.name = RTE_STR(nm);\
        rte_dpaa_driver_register(&dpaa_drv); \