From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: <dev@dpdk.org>, <olivier.matz@6wind.com>
Cc: <thomas.monjalon@6wind.com>, <shreyansh.jain@nxp.com>,
<ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH v3 20/21] bus/fslmc: add support for DMA mapping for ARM SMMU
Date: Sun, 9 Apr 2017 13:20:23 +0530 [thread overview]
Message-ID: <1491724224-6319-21-git-send-email-hemant.agrawal@nxp.com> (raw)
In-Reply-To: <1491724224-6319-1-git-send-email-hemant.agrawal@nxp.com>
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
drivers/bus/fslmc/fslmc_vfio.c | 96 +++++++++++++++++++++++++++++
drivers/bus/fslmc/fslmc_vfio.h | 1 +
drivers/bus/fslmc/rte_bus_fslmc_version.map | 1 +
3 files changed, 98 insertions(+)
diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index d28fb7b..5d4ac67 100644
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -76,8 +76,10 @@
static struct fslmc_vfio_group vfio_groups[VFIO_MAX_GRP];
static struct fslmc_vfio_container vfio_containers[VFIO_MAX_CONTAINERS];
static int container_device_fd;
+static uint32_t *msi_intr_vaddr;
void *(*rte_mcp_ptr_list);
static uint32_t mcp_id;
+static int is_dma_done;
static int vfio_connect_container(struct fslmc_vfio_group *vfio_group)
{
@@ -147,6 +149,35 @@ static int vfio_connect_container(struct fslmc_vfio_group *vfio_group)
return 0;
}
+static int vfio_map_irq_region(struct fslmc_vfio_group *group)
+{
+ int ret;
+ unsigned long *vaddr = NULL;
+ struct vfio_iommu_type1_dma_map map = {
+ .argsz = sizeof(map),
+ .flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE,
+ .vaddr = 0x6030000,
+ .iova = 0x6030000,
+ .size = 0x1000,
+ };
+
+ vaddr = (unsigned long *)mmap(NULL, 0x1000, PROT_WRITE |
+ PROT_READ, MAP_SHARED, container_device_fd, 0x6030000);
+ if (vaddr == MAP_FAILED) {
+ FSLMC_VFIO_LOG(ERR, "Unable to map region (errno = %d)", errno);
+ return -errno;
+ }
+
+ msi_intr_vaddr = (uint32_t *)((char *)(vaddr) + 64);
+ map.vaddr = (unsigned long)vaddr;
+ ret = ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA, &map);
+ if (ret == 0)
+ return 0;
+
+ FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA fails (errno = %d)", errno);
+ return -errno;
+}
+
int vfio_dmamap_mem_region(uint64_t vaddr,
uint64_t iova,
uint64_t size)
@@ -170,6 +201,71 @@ int vfio_dmamap_mem_region(uint64_t vaddr,
return 0;
}
+int rte_fslmc_vfio_dmamap(void)
+{
+ int ret;
+ struct fslmc_vfio_group *group;
+ struct vfio_iommu_type1_dma_map dma_map = {
+ .argsz = sizeof(struct vfio_iommu_type1_dma_map),
+ .flags = VFIO_DMA_MAP_FLAG_READ | VFIO_DMA_MAP_FLAG_WRITE,
+ };
+
+ int i;
+ const struct rte_memseg *memseg;
+
+ if (is_dma_done)
+ return 0;
+ is_dma_done = 1;
+
+ for (i = 0; i < RTE_MAX_MEMSEG; i++) {
+ memseg = rte_eal_get_physmem_layout();
+ if (memseg == NULL) {
+ FSLMC_VFIO_LOG(ERR, "Cannot get physical layout.");
+ return -ENODEV;
+ }
+
+ if (memseg[i].addr == NULL && memseg[i].len == 0)
+ break;
+
+ dma_map.size = memseg[i].len;
+ dma_map.vaddr = memseg[i].addr_64;
+#ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
+ dma_map.iova = memseg[i].phys_addr;
+#else
+ dma_map.iova = dma_map.vaddr;
+#endif
+
+ /* SET DMA MAP for IOMMU */
+ group = &vfio_groups[0];
+
+ if (!group->container) {
+ FSLMC_VFIO_LOG(ERR, "Container is not connected ");
+ return -1;
+ }
+
+ FSLMC_VFIO_LOG(DEBUG, "-->Initial SHM Virtual ADDR %llX",
+ dma_map.vaddr);
+ FSLMC_VFIO_LOG(DEBUG, "-----> DMA size 0x%llX\n", dma_map.size);
+ ret = ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA,
+ &dma_map);
+ if (ret) {
+ FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA API"
+ "(errno = %d)", errno);
+ return ret;
+ }
+ FSLMC_VFIO_LOG(DEBUG, "-----> dma_map.vaddr = 0x%llX",
+ dma_map.vaddr);
+ }
+
+ /* TODO - This is a W.A. as VFIO currently does not add the mapping of
+ * the interrupt region to SMMU. This should be removed once the
+ * support is added in the Kernel.
+ */
+ vfio_map_irq_region(group);
+
+ return 0;
+}
+
static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj)
{
int64_t v_addr = (int64_t)MAP_FAILED;
diff --git a/drivers/bus/fslmc/fslmc_vfio.h b/drivers/bus/fslmc/fslmc_vfio.h
index 80c6869..53dd0b7 100644
--- a/drivers/bus/fslmc/fslmc_vfio.h
+++ b/drivers/bus/fslmc/fslmc_vfio.h
@@ -70,6 +70,7 @@ int vfio_dmamap_mem_region(
int fslmc_vfio_setup_group(void);
int fslmc_vfio_process_group(void);
+int rte_fslmc_vfio_dmamap(void);
/* create dpio device */
int dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev,
diff --git a/drivers/bus/fslmc/rte_bus_fslmc_version.map b/drivers/bus/fslmc/rte_bus_fslmc_version.map
index ed445e2..09c4fac 100644
--- a/drivers/bus/fslmc/rte_bus_fslmc_version.map
+++ b/drivers/bus/fslmc/rte_bus_fslmc_version.map
@@ -41,6 +41,7 @@ DPDK_17.05 {
qbman_swp_send_multiple;
rte_fslmc_driver_register;
rte_fslmc_driver_unregister;
+ rte_fslmc_vfio_dmamap;
rte_mcp_ptr_list;
local: *;
--
2.1.4
next prev parent reply other threads:[~2017-04-09 7:49 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 12:47 [dpdk-dev] [PATCH v1] NXP DPAA2 External Mempool Driver Hemant Agrawal
2017-03-17 12:47 ` [dpdk-dev] [PATCH v1] mempool/dpaa2: add DPAA2 hardware offloaded mempool Hemant Agrawal
2017-03-22 6:09 ` Jianbo Liu
2017-03-23 16:57 ` Hemant Agrawal
2017-03-24 14:57 ` Ferruh Yigit
2017-03-24 15:59 ` Ferruh Yigit
2017-03-24 16:31 ` Olivier Matz
2017-03-24 16:38 ` Ferruh Yigit
2017-03-24 16:42 ` Olivier Matz
2017-03-27 16:30 ` Olivier Matz
2017-03-28 9:45 ` Hemant Agrawal
2017-03-30 11:29 ` Ferruh Yigit
2017-03-30 12:50 ` Hemant Agrawal
2017-03-30 13:52 ` Thomas Monjalon
2017-04-03 14:50 ` Ferruh Yigit
2017-04-09 7:59 ` [dpdk-dev] [PATCH v2] NXP DPAA2 External Mempool Driver Hemant Agrawal
2017-04-09 7:59 ` [dpdk-dev] [PATCH v2] mempool/dpaa2: add DPAA2 hardware offloaded mempool Hemant Agrawal
2017-04-10 19:58 ` Olivier MATZ
2017-04-11 5:58 ` Hemant Agrawal
2017-04-11 7:50 ` Thomas Monjalon
2017-04-11 8:39 ` Ferruh Yigit
2017-04-11 12:50 ` Thomas Monjalon
2017-04-11 12:56 ` Olivier MATZ
2017-04-11 13:54 ` Hemant Agrawal
2017-04-11 13:42 ` [dpdk-dev] [PATCH v3] NXP DPAA2 External Mempool Driver Hemant Agrawal
2017-04-11 13:42 ` [dpdk-dev] [PATCH v3] mempool/dpaa2: add DPAA2 hardware offloaded mempool Hemant Agrawal
2017-04-12 11:31 ` [dpdk-dev] [PATCH v3] NXP DPAA2 External Mempool Driver Ferruh Yigit
2017-04-12 13:50 ` Ferruh Yigit
2017-03-17 13:42 ` [dpdk-dev] [PATCH v1] " Thomas Monjalon
2017-03-17 17:12 ` Hemant Agrawal
2017-03-17 17:22 ` Olivier Matz
2017-03-20 10:08 ` Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 00/21] NXP DPAA2 FSLMC Bus driver Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 01/21] mk/dpaa2: add the crc support to the machine type Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 02/21] bus/fslmc: introducing fsl-mc bus driver Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 03/21] bus/fslmc: add QBMAN driver to bus Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 04/21] bus/fslmc: introduce MC object functions Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 05/21] bus/fslmc: add mc dpio object support Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 06/21] bus/fslmc: add mc dpbp " Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 07/21] eal/vfio: adding vfio utility functions in map file Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 08/21] bus/fslmc: add vfio support Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 09/21] bus/fslmc: scan for net and sec device Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 10/21] bus/fslmc: add debug log support Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 11/21] bus/fslmc: dpio portal driver Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 12/21] bus/fslmc: introduce support for hardware mempool object Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 13/21] bus/fslmc: affine dpio to crypto threads Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 14/21] bus/fslmc: define queues for DPAA2 devices Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 15/21] bus/fslmc: define hardware annotation area size Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 16/21] bus/fslmc: introduce true and false macros Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 17/21] bus/fslmc: define VLAN header length Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 18/21] bus/fslmc: add packet FLE definitions Hemant Agrawal
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 19/21] bus/fslmc: add physical-virtual address translation helpers Hemant Agrawal
2017-04-09 7:50 ` Hemant Agrawal [this message]
2017-04-09 7:50 ` [dpdk-dev] [PATCH v3 21/21] bus/fslmc: frame queue based dq storage alloc Hemant Agrawal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491724224-6319-21-git-send-email-hemant.agrawal@nxp.com \
--to=hemant.agrawal@nxp.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=olivier.matz@6wind.com \
--cc=shreyansh.jain@nxp.com \
--cc=thomas.monjalon@6wind.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).