memzone: rename address from physical to IOVA

[dpdk.git] / lib / librte_mempool / rte_mempool.c

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index 57a4f81..aad3294 100644 (file)
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -503,7 +503,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
        for (off = 0; off + pg_sz <= len &&
                     mp->populated_size < mp->size; off += phys_len) {
 
-               paddr = rte_mem_virt2phy(addr + off);
+               paddr = rte_mem_virt2iova(addr + off);
 
                if (paddr == RTE_BAD_PHYS_ADDR && rte_eal_has_hugepages()) {
                        ret = -EINVAL;
@@ -514,7 +514,7 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char *addr,
                for (phys_len = pg_sz; off + phys_len < len; phys_len += pg_sz) {
                        phys_addr_t paddr_tmp;
 
-                       paddr_tmp = rte_mem_virt2phy(addr + off + phys_len);
+                       paddr_tmp = rte_mem_virt2iova(addr + off + phys_len);
 
                        if (paddr_tmp != paddr + phys_len)
                                break;
@@ -559,10 +559,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
        /* Get mempool capabilities */
        mp_flags = 0;
        ret = rte_mempool_ops_get_capabilities(mp, &mp_flags);
-       if (ret == -ENOTSUP)
-               RTE_LOG(DEBUG, MEMPOOL, "get_capability not supported for %s\n",
-                                       mp->name);
-       else if (ret < 0)
+       if ((ret < 0) && (ret != -ENOTSUP))
                return ret;
 
        /* update mempool capabilities */
@@ -604,7 +601,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
                if (mp->flags & MEMPOOL_F_NO_PHYS_CONTIG)
                        paddr = RTE_BAD_PHYS_ADDR;
                else
-                       paddr = mz->phys_addr;
+                       paddr = mz->iova;
 
                if (rte_eal_has_hugepages())
                        ret = rte_mempool_populate_phys(mp, mz->addr,
@@ -1216,7 +1213,7 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
        fprintf(f, "mempool <%s>@%p\n", mp->name, mp);
        fprintf(f, "  flags=%x\n", mp->flags);
        fprintf(f, "  pool=%p\n", mp->pool_data);
-       fprintf(f, "  phys_addr=0x%" PRIx64 "\n", mp->mz->phys_addr);
+       fprintf(f, "  iova=0x%" PRIx64 "\n", mp->mz->iova);
        fprintf(f, "  nb_mem_chunks=%u\n", mp->nb_mem_chunks);
        fprintf(f, "  size=%"PRIu32"\n", mp->size);
        fprintf(f, "  populated_size=%"PRIu32"\n", mp->populated_size);