From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal structure fields, variables and comments to the NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <[email protected]> --- drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 12 ++++++------ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index a5b8aff146..f0bb698390 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -356,7 +356,7 @@ cnxk_cpt_metabuf_mempool_create(const struct rte_cryptodev *dev, dev->data->dev_id, qp_id); pool = rte_mempool_create(mempool_name, mb_pool_sz, mlen, cache_sz, 0, - NULL, NULL, NULL, NULL, rte_socket_id(), 0); + NULL, NULL, NULL, NULL, rte_numa_id(), 0); if (pool == NULL) { plt_err("Could not create mempool for metabuf"); @@ -394,7 +394,7 @@ cnxk_cpt_qp_create(const struct rte_cryptodev *dev, uint16_t qp_id, int ret; /* Allocate queue pair */ - qp = rte_zmalloc_socket("CNXK Crypto PMD Queue Pair", sizeof(*qp), + qp = rte_zmalloc_numa("CNXK Crypto PMD Queue Pair", sizeof(*qp), ROC_ALIGN, 0); if (qp == NULL) { plt_err("Could not allocate queue pair"); @@ -407,7 +407,7 @@ cnxk_cpt_qp_create(const struct rte_cryptodev *dev, uint16_t qp_id, qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id, qp_id); - pq_mem = rte_memzone_reserve_aligned(name, len, rte_socket_id(), + pq_mem = rte_memzone_reserve_aligned(name, len, rte_numa_id(), RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB, RTE_CACHE_LINE_SIZE); if (pq_mem == NULL) { @@ -499,7 +499,7 @@ cnxk_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id) int cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *conf, - int socket_id __rte_unused) + int numa_id __rte_unused) { struct cnxk_cpt_vf *vf = dev->data->dev_private; struct roc_cpt *roc_cpt = &vf->cpt; @@ -593,7 +593,7 @@ cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, int cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id, - const struct rte_cryptodev_qp_conf *conf, int socket_id) + const struct rte_cryptodev_qp_conf *conf, int numa_id) { if (conf == NULL) { struct cnxk_cpt_vf *vf = dev->data->dev_private; @@ -618,7 +618,7 @@ cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id, return 0; } - return cnxk_cpt_queue_pair_setup(dev, qp_id, conf, socket_id); + return cnxk_cpt_queue_pair_setup(dev, qp_id, conf, numa_id); } uint32_t diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index 6c4265f339..a605ceb613 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -139,10 +139,10 @@ void cnxk_cpt_dev_info_get(struct rte_cryptodev *dev, int cnxk_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *conf, - int socket_id __rte_unused); + int numa_id __rte_unused); int cnxk_cpt_queue_pair_reset(struct rte_cryptodev *dev, uint16_t qp_id, - const struct rte_cryptodev_qp_conf *conf, int socket_id); + const struct rte_cryptodev_qp_conf *conf, int numa_id); int cnxk_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id); -- 2.55.0
