From: Santosh Shukla <sshukla@mvista.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v5 07/11] virtio: pci: extend virtio pci rw api for vfio interface
Date: Tue, 19 Jan 2016 17:16:08 +0530 [thread overview]
Message-ID: <1453203972-24855-8-git-send-email-sshukla@mvista.com> (raw)
In-Reply-To: <1453203972-24855-1-git-send-email-sshukla@mvista.com>
So far virtio handle rw access for uio / ioport interface, This patch to extend
the support for vfio interface.
Applicable for virtio 0.95 spec.
Signed-off-by: Santosh Shukla <sshukla@mvista.com>
---
v4--> v5:
- Replaced virtio_rd/wr_1/2/4() macro implementation with inline function, per
Yuan review commment.
drivers/net/virtio/virtio_pci.c | 110 ++++++++++++++++++++++++++++++++++-----
1 file changed, 97 insertions(+), 13 deletions(-)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index a9f179f..0c29f1d 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -40,6 +40,7 @@
#include "virtio_pci.h"
#include "virtio_logs.h"
#include "virtqueue.h"
+#include "virtio_vfio_rw.h"
/*
* Following macros are derieved from linux/pci_regs.h, however,
@@ -49,24 +50,107 @@
#define PCI_CAPABILITY_LIST 0x34
#define PCI_CAP_ID_VNDR 0x09
-
#define VIRTIO_PCI_REG_ADDR(hw, reg) \
(unsigned short)((hw)->io_base + (reg))
-#define VIRTIO_READ_REG_1(hw, reg) \
- inb((VIRTIO_PCI_REG_ADDR((hw), (reg))))
-#define VIRTIO_WRITE_REG_1(hw, reg, value) \
- outb_p((unsigned char)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
+static inline uint8_t
+virtio_read_reg_1(struct virtio_hw *hw, uint64_t reg_offset)
+{
+ uint8_t ret;
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_inb(dev, reg_offset, &ret);
+ else
+ ret = inb(VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+
+ return ret;
+}
+
+static inline uint16_t
+virtio_read_reg_2(struct virtio_hw *hw, uint64_t reg_offset)
+{
+ uint16_t ret;
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_inw(dev, reg_offset, &ret);
+ else
+ ret = inw(VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+
+ return ret;
+}
+
+static inline uint32_t
+virtio_read_reg_4(struct virtio_hw *hw, uint64_t reg_offset)
+{
+ uint32_t ret;
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_inl(dev, reg_offset, &ret);
+ else
+ ret = inl(VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+
+ return ret;
+}
+
+static inline void
+virtio_write_reg_1(struct virtio_hw *hw, uint64_t reg_offset, uint8_t value)
+{
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_outb_p(dev, reg_offset, value);
+ else
+ outb_p((unsigned char)value,
+ VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+}
+
+static inline void
+virtio_write_reg_2(struct virtio_hw *hw, uint64_t reg_offset, uint16_t value)
+{
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_outw_p(dev, reg_offset, value);
+ else
+ outw_p((unsigned short)value,
+ VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+}
+
+static inline void
+virtio_write_reg_4(struct virtio_hw *hw, uint64_t reg_offset, uint32_t value)
+{
+ struct rte_pci_device *dev;
+
+ dev = hw->dev;
+ if (dev->kdrv == RTE_KDRV_VFIO)
+ ioport_outl_p(dev, reg_offset, value);
+ else
+ outl_p((unsigned int)value,
+ VIRTIO_PCI_REG_ADDR(hw, reg_offset));
+}
+
+#define VIRTIO_READ_REG_1(hw, reg) \
+ virtio_read_reg_1((hw), (reg))
+#define VIRTIO_WRITE_REG_1(hw, reg, value) \
+ virtio_write_reg_1((hw), (reg), (value))
-#define VIRTIO_READ_REG_2(hw, reg) \
- inw((VIRTIO_PCI_REG_ADDR((hw), (reg))))
-#define VIRTIO_WRITE_REG_2(hw, reg, value) \
- outw_p((unsigned short)(value), (VIRTIO_PCI_REG_ADDR((hw), (reg))))
+#define VIRTIO_READ_REG_2(hw, reg) \
+ virtio_read_reg_2((hw), (reg))
+#define VIRTIO_WRITE_REG_2(hw, reg, value) \
+ virtio_write_reg_2((hw), (reg), (value))
-#define VIRTIO_READ_REG_4(hw, reg) \
- 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))))
+#define VIRTIO_READ_REG_4(hw, reg) \
+ virtio_read_reg_4((hw), (reg))
+#define VIRTIO_WRITE_REG_4(hw, reg, value) \
+ virtio_write_reg_4((hw), (reg), (value))
static void
legacy_read_dev_config(struct virtio_hw *hw, uint64_t offset,
--
1.7.9.5
next prev parent reply other threads:[~2016-01-19 11:46 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 11:46 [dpdk-dev] [PATCH v5 00/11] Add virtio support for arm/arm64 Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 01/11] virtio: Introduce config RTE_VIRTIO_INC_VECTOR Santosh Shukla
2016-01-27 2:23 ` Santosh Shukla
2016-01-27 2:33 ` Yuanhan Liu
2016-01-29 4:32 ` Santosh Shukla
2016-01-29 4:42 ` Yuanhan Liu
2016-01-29 4:45 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 02/11] linuxapp: eal: arm: Always return 0 for rte_eal_iopl_init() Santosh Shukla
2016-01-21 9:41 ` David Marchand
2016-01-21 10:07 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 03/11] linuxapp/vfio: ignore mapping for ioport region Santosh Shukla
2016-01-27 2:24 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 04/11] virtio_pci.h: build fix for sys/io.h for non-x86 arch Santosh Shukla
2016-01-27 2:25 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 05/11] eal: pci: vfio: add rd/wr func for pci bar space Santosh Shukla
2016-01-21 9:42 ` David Marchand
2016-01-21 10:08 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 06/11] virtio: vfio: add api support to rd/wr ioport bar Santosh Shukla
2016-01-29 7:07 ` Yuanhan Liu
2016-01-29 7:16 ` Santosh Shukla
2016-01-19 11:46 ` Santosh Shukla [this message]
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 08/11] eal: pci: introduce RTE_KDRV_VFIO_NOIOMMUi driver mode Santosh Shukla
2016-01-19 14:18 ` Burakov, Anatoly
2016-01-19 18:36 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 09/11] virtio_pci: do not parse if interface is vfio-noiommu Santosh Shukla
2016-01-29 7:17 ` Yuanhan Liu
2016-01-29 7:22 ` Santosh Shukla
2016-01-29 7:34 ` Yuanhan Liu
2016-01-29 9:02 ` Thomas Monjalon
2016-01-29 9:14 ` Yuanhan Liu
2016-01-29 9:16 ` Santosh Shukla
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 10/11] virtio: pci: add dummy func definition for in/outb for non-x86 arch Santosh Shukla
2016-01-27 10:37 ` Santosh Shukla
2016-01-29 7:01 ` Yuanhan Liu
2016-01-29 7:31 ` Santosh Shukla
2016-01-29 7:38 ` Yuanhan Liu
2016-01-19 11:46 ` [dpdk-dev] [PATCH v5 11/11] vfio: Support for no-IOMMU mode Santosh Shukla
2016-01-25 7:25 ` [dpdk-dev] [PATCH v5 00/11] Add virtio support for arm/arm64 Santosh Shukla
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=1453203972-24855-8-git-send-email-sshukla@mvista.com \
--to=sshukla@mvista.com \
--cc=dev@dpdk.org \
/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).