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/octeontx/otx_cryptodev.c | 2 +- drivers/crypto/octeontx/otx_cryptodev_hw_access.c | 2 +- drivers/crypto/octeontx/otx_cryptodev_ops.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c index b2f6f53ee3..8ddfa28865 100644 --- a/drivers/crypto/octeontx/otx_cryptodev.c +++ b/drivers/crypto/octeontx/otx_cryptodev.c @@ -42,7 +42,7 @@ otx_cpt_pci_probe(struct rte_pci_driver *pci_drv, rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); - cryptodev = rte_cryptodev_pmd_allocate(name, rte_socket_id()); + cryptodev = rte_cryptodev_pmd_allocate(name, rte_numa_id()); if (cryptodev == NULL) return -ENOMEM; diff --git a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c index 27604459e4..6c91a82564 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c +++ b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c @@ -458,7 +458,7 @@ otx_cpt_metabuf_mempool_create(const struct rte_cryptodev *dev, pool = rte_mempool_create_empty(mempool_name, mb_pool_sz, max_mlen, METABUF_POOL_CACHE_SIZE, 0, - rte_socket_id(), 0); + rte_numa_id(), 0); if (pool == NULL) { CPT_LOG_ERR("Could not create mempool for metabuf"); diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c index 40f565cd78..abb94bf8d1 100644 --- a/drivers/crypto/octeontx/otx_cryptodev_ops.c +++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c @@ -137,7 +137,7 @@ static int otx_cpt_que_pair_setup(struct rte_cryptodev *dev, uint16_t que_pair_id, const struct rte_cryptodev_qp_conf *qp_conf, - int socket_id __rte_unused) + int numa_id __rte_unused) { struct cpt_instance *instance = NULL; struct rte_pci_device *pci_dev; @@ -1017,9 +1017,9 @@ otx_cpt_dev_create(struct rte_cryptodev *c_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - cptvf = rte_zmalloc_socket("otx_cryptodev_private_mem", + cptvf = rte_zmalloc_numa("otx_cryptodev_private_mem", sizeof(struct cpt_vf), RTE_CACHE_LINE_SIZE, - rte_socket_id()); + rte_numa_id()); if (cptvf == NULL) { CPT_LOG_ERR("Cannot allocate memory for device private data"); -- 2.55.0
