From: Damjan Marion <damarion@cisco.com>
Date: Tue, 29 May 2018 20:46:50 +0000 (+0200)
Subject: Revert "dpdk: set dmamap iova address value according to eal_iova_mode"
X-Git-Tag: v18.07-rc1~258
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=5ffc8858e7f6edaa157dcf78c3acd49ef8d63260;p=vpp.git

Revert "dpdk: set dmamap iova address value according to eal_iova_mode"

This breaks VFIO operation.

This reverts commit d3b3baa4f8e9e4d95264aff16fe85434ef8061bd.

Change-Id: I2482e0da2d1ebfc365d13668c4b992b040f561b4
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/src/plugins/dpdk/buffer.c b/src/plugins/dpdk/buffer.c
index 3324c049511..148f7891788 100644
--- a/src/plugins/dpdk/buffer.c
+++ b/src/plugins/dpdk/buffer.c
@@ -548,10 +548,7 @@ dpdk_pool_create (vlib_main_t * vm, u8 * pool_name, u32 elt_size,
 	{
 	  dm.vaddr = pointer_to_uword (pr->mem) + (i << pr->log2_page_size);
 	  dm.size = 1 << pr->log2_page_size;
-	  if (rte_eal_iova_mode() == RTE_IOVA_PA)
-		  dm.iova = pr->page_table[i];
-	  else
-		  dm.iova = dm.vaddr;
+	  dm.iova = pr->page_table[i];
 	  if ((rv = ioctl (dbm->vfio_container_fd, VFIO_IOMMU_MAP_DMA, &dm)))
 	    break;
 	}