From a1c557020f34c704efc05b01a8a6b262c4d942e5 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Mon, 16 Apr 2018 14:24:37 +0100 Subject: [PATCH] mempool/octeontx: prepare to remove register memory area op Callback to populate pool objects has all required information and executed a bit later than register memory area callback. Signed-off-by: Andrew Rybchenko Acked-by: Santosh Shukla --- .../mempool/octeontx/rte_mempool_octeontx.c | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/drivers/mempool/octeontx/rte_mempool_octeontx.c b/drivers/mempool/octeontx/rte_mempool_octeontx.c index 64ed5286d3..ab94dfe913 100644 --- a/drivers/mempool/octeontx/rte_mempool_octeontx.c +++ b/drivers/mempool/octeontx/rte_mempool_octeontx.c @@ -151,20 +151,6 @@ octeontx_fpavf_calc_mem_size(const struct rte_mempool *mp, return mem_size; } -static int -octeontx_fpavf_register_memory_area(const struct rte_mempool *mp, - char *vaddr, rte_iova_t paddr, size_t len) -{ - RTE_SET_USED(paddr); - uint8_t gpool; - uintptr_t pool_bar; - - gpool = octeontx_fpa_bufpool_gpool(mp->pool_id); - pool_bar = mp->pool_id & ~(uint64_t)FPA_GPOOL_MASK; - - return octeontx_fpavf_pool_set_range(pool_bar, len, vaddr, gpool); -} - static int octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs, void *vaddr, rte_iova_t iova, size_t len, @@ -172,6 +158,9 @@ octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs, { size_t total_elt_sz; size_t off; + uint8_t gpool; + uintptr_t pool_bar; + int ret; if (iova == RTE_BAD_IOVA) return -EINVAL; @@ -188,6 +177,13 @@ octeontx_fpavf_populate(struct rte_mempool *mp, unsigned int max_objs, iova += off; len -= off; + gpool = octeontx_fpa_bufpool_gpool(mp->pool_id); + pool_bar = mp->pool_id & ~(uint64_t)FPA_GPOOL_MASK; + + ret = octeontx_fpavf_pool_set_range(pool_bar, len, vaddr, gpool); + if (ret < 0) + return ret; + return rte_mempool_op_populate_default(mp, max_objs, vaddr, iova, len, obj_cb, obj_cb_arg); } @@ -199,7 +195,6 @@ static struct rte_mempool_ops octeontx_fpavf_ops = { .enqueue = octeontx_fpavf_enqueue, .dequeue = octeontx_fpavf_dequeue, .get_count = octeontx_fpavf_get_count, - .register_memory_area = octeontx_fpavf_register_memory_area, .calc_mem_size = octeontx_fpavf_calc_mem_size, .populate = octeontx_fpavf_populate, }; -- 2.20.1