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/dma/imx_edma5/imx_edma5_dmadev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx_edma5/imx_edma5_dmadev.c b/drivers/dma/imx_edma5/imx_edma5_dmadev.c index 778644fa82..33f751465f 100644 --- a/drivers/dma/imx_edma5/imx_edma5_dmadev.c +++ b/drivers/dma/imx_edma5/imx_edma5_dmadev.c @@ -100,7 +100,7 @@ imx_edma5_configure(struct rte_dma_dev *dev, const struct rte_dma_conf *conf, ui RTE_SET_USED(conf_sz); if (ed->vchans == NULL) { - ed->vchans = rte_zmalloc_socket("imx_edma5_vchans", + ed->vchans = rte_zmalloc_numa("imx_edma5_vchans", ed->max_vchans * sizeof(struct imx_edma5_vchan), RTE_CACHE_LINE_SIZE, dev->data->numa_node); if (ed->vchans == NULL) { @@ -202,7 +202,7 @@ imx_edma5_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan, vc->desc_mask = conf->nb_desc - 1; vc->iova_is_va = (rte_eal_iova_mode() == RTE_IOVA_VA); - vc->jobs = rte_zmalloc_socket("imx_edma5_jobs", vc->nb_desc * sizeof(struct imx_edma5_job), + vc->jobs = rte_zmalloc_numa("imx_edma5_jobs", vc->nb_desc * sizeof(struct imx_edma5_job), RTE_CACHE_LINE_SIZE, dev->data->numa_node); if (vc->jobs == NULL) { IMX_EDMA5_LOG(ERR, "Failed to alloc job ring for vchan %u", vchan); @@ -210,7 +210,7 @@ imx_edma5_vchan_setup(struct rte_dma_dev *dev, uint16_t vchan, } /* One IMX_EDMA5_SG_TCD_PER_JOB descriptor slice per job ring slot. */ - vc->sg_tcd_pool = rte_zmalloc_socket("imx_edma5_sgtcd", + vc->sg_tcd_pool = rte_zmalloc_numa("imx_edma5_sgtcd", (size_t)vc->nb_desc * IMX_EDMA5_SG_TCD_PER_JOB * sizeof(struct imx_edma5_hw_tcd64), RTE_CACHE_LINE_SIZE, dev->data->numa_node); if (vc->sg_tcd_pool == NULL) { @@ -1037,7 +1037,7 @@ imx_edma5_probe(struct rte_platform_device *pdev) return -EINVAL; } - dev = rte_dma_pmd_allocate(name, rte_socket_id(), sizeof(struct imx_edma5_dev)); + dev = rte_dma_pmd_allocate(name, rte_numa_id(), sizeof(struct imx_edma5_dev)); if (dev == NULL) { IMX_EDMA5_LOG(ERR, "Failed to allocate dmadev for %s", name); return -ENOMEM; -- 2.55.0
