compress/isal: add skeleton ISA-L compression PMD

[dpdk.git] / drivers / mempool / octeontx / octeontx_fpavf.c

diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c
index d14ee47..7aecaa8 100644 (file)
--- a/drivers/mempool/octeontx/octeontx_fpavf.c
+++ b/drivers/mempool/octeontx/octeontx_fpavf.c
@@ -105,6 +105,18 @@ struct octeontx_fpadev {
 
 static struct octeontx_fpadev fpadev;
 
+int octeontx_logtype_fpavf;
+int octeontx_logtype_fpavf_mbox;
+
+RTE_INIT(otx_pool_init_log);
+static void
+otx_pool_init_log(void)
+{
+       octeontx_logtype_fpavf = rte_log_register("pmd.mempool.octeontx");
+       if (octeontx_logtype_fpavf >= 0)
+               rte_log_set_level(octeontx_logtype_fpavf, RTE_LOG_NOTICE);
+}
+
 /* lock is taken by caller */
 static int
 octeontx_fpa_gpool_alloc(unsigned int object_size)
@@ -237,7 +249,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size,
        cfg.pool_stack_end = phys_addr + memsz;
        cfg.aura_cfg = (1 << 9);
 
-       ret = octeontx_ssovf_mbox_send(&hdr, &cfg,
+       ret = octeontx_mbox_send(&hdr, &cfg,
                                        sizeof(struct octeontx_mbox_fpa_cfg),
                                        &resp, sizeof(resp));
        if (ret < 0) {
@@ -282,7 +294,7 @@ octeontx_fpapf_pool_destroy(unsigned int gpool_index)
        cfg.pool_stack_end = 0;
        cfg.aura_cfg = 0;
 
-       ret = octeontx_ssovf_mbox_send(&hdr, &cfg,
+       ret = octeontx_mbox_send(&hdr, &cfg,
                                        sizeof(struct octeontx_mbox_fpa_cfg),
                                        &resp, sizeof(resp));
        if (ret < 0) {
@@ -317,7 +329,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index)
        memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg));
        cfg.aid = gpool_index; /* gpool is guara */
 
-       ret = octeontx_ssovf_mbox_send(&hdr, &cfg,
+       ret = octeontx_mbox_send(&hdr, &cfg,
                                        sizeof(struct octeontx_mbox_fpa_cfg),
                                        &resp, sizeof(resp));
        if (ret < 0) {
@@ -347,7 +359,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index)
        hdr.coproc = FPA_COPROC;
        hdr.msg = FPA_DETACHAURA;
        hdr.vfid = gpool_index;
-       ret = octeontx_ssovf_mbox_send(&hdr, &cfg, sizeof(cfg), NULL, 0);
+       ret = octeontx_mbox_send(&hdr, &cfg, sizeof(cfg), NULL, 0);
        if (ret < 0) {
                fpavf_log_err("Couldn't detach FPA aura %d Err=%d FuncErr=%d\n",
                              gpool_index, ret, hdr.res_code);
@@ -358,8 +370,8 @@ err:
        return ret;
 }
 
-static int
-octeontx_fpavf_pool_setup(uintptr_t handle, unsigned long memsz,
+int
+octeontx_fpavf_pool_set_range(uintptr_t handle, unsigned long memsz,
                          void *memva, uint16_t gpool)
 {
        uint64_t va_end;
@@ -394,7 +406,7 @@ octeontx_fpapf_start_count(uint16_t gpool_index)
        hdr.coproc = FPA_COPROC;
        hdr.msg = FPA_START_COUNT;
        hdr.vfid = gpool_index;
-       ret = octeontx_ssovf_mbox_send(&hdr, NULL, 0, NULL, 0);
+       ret = octeontx_mbox_send(&hdr, NULL, 0, NULL, 0);
        if (ret < 0) {
                fpavf_log_err("Could not start buffer counting for ");
                fpavf_log_err("FPA pool %d. Err=%d. FuncErr=%d\n",
@@ -481,12 +493,9 @@ octeontx_fpa_bufpool_free_count(uintptr_t handle)
 
 uintptr_t
 octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,
-                               unsigned int buf_offset, char **va_start,
-                               int node_id)
+                               unsigned int buf_offset, int node_id)
 {
        unsigned int gpool;
-       void *memva;
-       unsigned long memsz;
        uintptr_t gpool_handle;
        uintptr_t pool_bar;
        int res;
@@ -494,9 +503,6 @@ octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,
        RTE_SET_USED(node_id);
        RTE_BUILD_BUG_ON(sizeof(struct rte_mbuf) > OCTEONTX_FPAVF_BUF_OFFSET);
 
-       if (unlikely(*va_start == NULL))
-               goto error_end;
-
        object_size = RTE_CACHE_LINE_ROUNDUP(object_size);
        if (object_size > FPA_MAX_OBJ_SIZE) {
                errno = EINVAL;
@@ -539,15 +545,6 @@ octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,
                goto error_pool_destroy;
        }
 
-       /* vf pool setup */
-       memsz = object_size * object_count;
-       memva = *va_start;
-       res = octeontx_fpavf_pool_setup(pool_bar, memsz, memva, gpool);
-       if (res < 0) {
-               errno = res;
-               goto error_gaura_detach;
-       }
-
        /* Release lock */
        rte_spinlock_unlock(&fpadev.lock);
 
@@ -563,8 +560,6 @@ octeontx_fpa_bufpool_create(unsigned int object_size, unsigned int object_count,
 
        return gpool_handle;
 
-error_gaura_detach:
-       (void) octeontx_fpapf_aura_detach(gpool);
 error_pool_destroy:
        octeontx_fpavf_free(gpool);
        octeontx_fpapf_pool_destroy(gpool);