bus/dpaa: mark internal symbols

[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 6fa0c3d..d4aee13 100644 (file)
--- a/drivers/bus/dpaa/rte_dpaa_bus.h
+++ b/drivers/bus/dpaa/rte_dpaa_bus.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- *   Copyright 2017 NXP
+ *   Copyright 2017-2019 NXP
  *
  */
 #ifndef __RTE_DPAA_BUS_H__
@@ -8,14 +8,15 @@
 
 #include <rte_bus.h>
 #include <rte_mempool.h>
+#include <dpaax_iova_table.h>
 
+#include <dpaa_of.h>
 #include <fsl_usd.h>
 #include <fsl_qman.h>
 #include <fsl_bman.h>
-#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)        \
                container_of(ptr, struct rte_dpaa_device, device)
@@ -29,8 +30,13 @@
 #define SVR_LS1046A_FAMILY     0x87070000
 #define SVR_MASK               0xffff0000
 
+#define RTE_DEV_TO_DPAA_CONST(ptr) \
+       container_of(ptr, const struct rte_dpaa_device, device)
+
 extern unsigned int dpaa_svr_family;
 
+extern RTE_DEFINE_PER_LCORE(bool, dpaa_io);
+
 struct rte_dpaa_device;
 struct rte_dpaa_driver;
 
@@ -51,6 +57,7 @@ struct rte_dpaa_bus {
        struct rte_dpaa_device_list device_list;
        struct rte_dpaa_driver_list driver_list;
        int device_count;
+       int detected;
 };
 
 struct dpaa_device_id {
@@ -68,6 +75,7 @@ struct rte_dpaa_device {
        };
        struct rte_dpaa_driver *driver;
        struct dpaa_device_id id;
+       struct rte_intr_handle intr_handle;
        enum rte_dpaa_type device_type; /**< Ethernet or crypto type device */
        char name[RTE_ETH_NAME_MAX_LEN];
 };
@@ -91,20 +99,56 @@ 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;
+       void *va;
+
+       va = dpaax_iova_table_get_va(paddr);
+       if (likely(va != NULL))
+               return va;
+
+       /* 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 */
+       va = rte_mem_iova2virt(paddr);
+
+       dpaax_iova_table_update(paddr, va, RTE_CACHE_LINE_SIZE);
+
+       return va;
+}
+
+static inline rte_iova_t
+rte_dpaa_mem_vtop(void *vaddr)
+{
+       const struct rte_memseg *ms;
+
+       ms = rte_mem_virt2memseg(vaddr, NULL);
+       if (ms)
+               return ms->iova + RTE_PTR_DIFF(vaddr, ms->addr);
+
+       return (size_t)NULL;
 }
 
 /**
@@ -114,6 +158,7 @@ static inline void *rte_dpaa_mem_ptov(phys_addr_t paddr)
  *   A pointer to a rte_dpaa_driver structure describing the driver
  *   to be registered.
  */
+__rte_internal
 void rte_dpaa_driver_register(struct rte_dpaa_driver *driver);
 
 /**
@@ -123,6 +168,7 @@ void rte_dpaa_driver_register(struct rte_dpaa_driver *driver);
  *     A pointer to a rte_dpaa_driver structure describing the driver
  *     to be unregistered.
  */
+__rte_internal
 void rte_dpaa_driver_unregister(struct rte_dpaa_driver *driver);
 
 /**
@@ -134,10 +180,13 @@ void rte_dpaa_driver_unregister(struct rte_dpaa_driver *driver);
  * @return
  *     0 in case of success, error otherwise
  */
+__rte_internal
 int rte_dpaa_portal_init(void *arg);
 
+__rte_internal
 int rte_dpaa_portal_fq_init(void *arg, struct qman_fq *fq);
 
+__rte_internal
 int rte_dpaa_portal_fq_close(struct qman_fq *fq);
 
 /**
@@ -147,8 +196,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); \