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/mvsam/rte_mrvl_pmd.c | 4 ++-- drivers/crypto/mvsam/rte_mrvl_pmd_ops.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd.c b/drivers/crypto/mvsam/rte_mrvl_pmd.c index c69f526c52..26069d9db3 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd.c @@ -1258,7 +1258,7 @@ cryptodev_mrvl_crypto_uninit(struct rte_vdev_device *vdev) return -EINVAL; MRVL_LOG(INFO, "Closing Marvell crypto device %s on numa socket %u.", - name, rte_socket_id()); + name, rte_numa_id()); sam_deinit(); rte_mvep_deinit(MVEP_MOD_T_SAM); @@ -1285,7 +1285,7 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_MRVL_PMD, cryptodev_mrvl_pmd_drv); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_MRVL_PMD, "max_nb_queue_pairs=<int> " "max_nb_sessions=<int> " - "socket_id=<int>"); + "numa_id=<int>"); RTE_PMD_REGISTER_CRYPTO_DRIVER(mrvl_crypto_drv, cryptodev_mrvl_pmd_drv.driver, cryptodev_driver_id); RTE_LOG_REGISTER_DEFAULT(mrvl_logtype_driver, NOTICE); diff --git a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c index 5a0658cf83..d485c3dd52 100644 --- a/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c +++ b/drivers/crypto/mvsam/rte_mrvl_pmd_ops.c @@ -628,21 +628,21 @@ mrvl_crypto_pmd_close(struct rte_cryptodev *dev) * @param dev Pointer to the device structure. * @param qp_id ID of the Queue Pair. * @param qp_conf Queue pair configuration (nb of descriptors). - * @param socket_id NUMA socket to allocate memory on. + * @param numa_id NUMA socket to allocate memory on. * @returns 0 upon success, negative value otherwise. */ static int mrvl_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf, - int socket_id) + int numa_id) { struct mrvl_crypto_qp *qp = NULL; char match[RTE_CRYPTODEV_NAME_MAX_LEN]; unsigned int n; /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket("MRVL Crypto PMD Queue Pair", sizeof(*qp), - RTE_CACHE_LINE_SIZE, socket_id); + qp = rte_zmalloc_numa("MRVL Crypto PMD Queue Pair", sizeof(*qp), + RTE_CACHE_LINE_SIZE, numa_id); if (qp == NULL) return -ENOMEM; -- 2.55.0
