[dpdk-dev] [PATCH v3 08/12] virtio: Add capability to initialize driver for vfio interface

[Santosh Shukla <sshukla@mvista.com>]

- adding pci_dev member in struct virtio_hw{} to track
vfio_dev_fd per virtio interface, required for ioport
rd/wr operation.

- Masked default VIRTIO_READ/WRITE for vfio case.

Signed-off-by: Santosh Shukla <sshukla@mvista.com>
Signed-off-by: Rizwan Ansari <ransari@mvista.com>
Signed-off-by: Rakesh Krishnamurhty <rakeshk@mvista.com>
---
 drivers/net/virtio/virtio_ethdev.c |   11 ++++++++++-
 drivers/net/virtio/virtio_pci.h    |    9 +++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index d928339..9ca99d5 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1287,9 +1287,18 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 
 	pci_dev = eth_dev->pci_dev;
 
+#ifdef RTE_EAL_VFIO
+	hw->pci_dev = pci_dev;
+
+	/* For debug use only */
+	const struct rte_intr_handle *intr_handle __rte_unused = &pci_dev->intr_handle;
+	PMD_INIT_LOG(DEBUG, "hw->pci_dev %p intr_handle %p vfio_dev_fd %d\n",
+			     hw->pci_dev, intr_handle,
+			     intr_handle->vfio_dev_fd);
+#endif
+
 	if (virtio_resource_init(pci_dev) < 0)
 		return -1;
-
 	hw->use_msix = virtio_has_msix(&pci_dev->addr);
 	hw->io_base = (uint32_t)(uintptr_t)pci_dev->mem_resource[0].addr;
 
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 8b5b031..6dabede 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -47,6 +47,10 @@
 
 #include <rte_ethdev.h>
 
+#ifdef RTE_EAL_VFIO
+#include "virtio_vfio.h"
+#endif
+
 struct virtqueue;
 
 /* VirtIO PCI vendor/device ID. */
@@ -176,6 +180,9 @@ struct virtio_hw {
 	uint8_t	    use_msix;
 	uint8_t     started;
 	uint8_t     mac_addr[ETHER_ADDR_LEN];
+#ifdef RTE_EAL_VFIO
+	const struct rte_pci_device *pci_dev;
+#endif
 };
 
 /*
@@ -228,6 +235,7 @@ outl_p(unsigned int data, unsigned int port)
 }
 #endif
 
+#ifndef RTE_EAL_VFIO
 #define VIRTIO_PCI_REG_ADDR(hw, reg) \
 	(unsigned short)((hw)->io_base + (reg))
 
@@ -245,6 +253,7 @@ outl_p(unsigned int data, unsigned int port)
 	inl((VIRTIO_PCI_REG_ADDR((hw), (reg))))
 #define VIRTIO_WRITE_REG_4(hw, reg, value) \
 	outl_p((unsigned int)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
+#endif
 
 static inline int
 vtpci_with_feature(struct virtio_hw *hw, uint32_t bit)
-- 
1.7.9.5