From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,
amorenoz@redhat.com, david.marchand@redhat.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH 15/40] net/virtio: move legacy IO to Virtio PCI
Date: Sun, 20 Dec 2020 22:13:40 +0100 [thread overview]
Message-ID: <20201220211405.313012-16-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20201220211405.313012-1-maxime.coquelin@redhat.com>
This patch moves Virtio PCI legacy IO handling to
virtio_pci.c. Two functions are created so that
virtio_pci_ethdev does not have to care about it.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/net/virtio/virtio_pci.c | 21 +++++++++++++++++++++
drivers/net/virtio/virtio_pci.h | 6 +++---
drivers/net/virtio/virtio_pci_ethdev.c | 4 ++--
3 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 8c62507a0a..230a438bf7 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -31,6 +31,15 @@
#define VIRTIO_PCI_CONFIG(hw) \
(((hw)->use_msix == VIRTIO_MSIX_ENABLED) ? 24 : 20)
+
+struct virtio_pci_internal {
+ struct rte_pci_ioport io;
+};
+
+#define VTPCI_IO(hw) (&virtio_pci_internal[(hw)->port_id].io)
+
+struct virtio_pci_internal virtio_pci_internal[RTE_MAX_ETHPORTS];
+
static inline int
check_vq_phys_addr_ok(struct virtqueue *vq)
{
@@ -838,3 +847,15 @@ vtpci_msix_detect(struct rte_pci_device *dev)
return VIRTIO_MSIX_NONE;
}
+
+void vtpci_legacy_ioport_unmap(struct virtio_hw *hw)
+{
+ rte_pci_ioport_unmap(VTPCI_IO(hw));
+}
+
+int vtpci_legacy_ioport_map(struct virtio_hw *hw)
+{
+ struct virtio_pci_dev *dev = virtio_pci_get_dev(hw);
+
+ return rte_pci_ioport_map(dev->pci_dev, 0, VTPCI_IO(hw));
+}
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index 15f68f141c..c3db36d2fc 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -297,15 +297,12 @@ struct virtio_pci_dev {
*/
struct virtio_hw_internal {
const struct virtio_pci_ops *vtpci_ops;
- struct rte_pci_ioport io;
};
#define VTPCI_OPS(hw) (virtio_hw_internal[(hw)->port_id].vtpci_ops)
-#define VTPCI_IO(hw) (&virtio_hw_internal[(hw)->port_id].io)
extern struct virtio_hw_internal virtio_hw_internal[RTE_MAX_ETHPORTS];
-
/*
* This structure is just a reference to read
* net device specific config space; it just a chodu structure
@@ -380,6 +377,9 @@ uint8_t vtpci_isr(struct virtio_hw *);
enum virtio_msix_status vtpci_msix_detect(struct rte_pci_device *dev);
+void vtpci_legacy_ioport_unmap(struct virtio_hw *hw);
+int vtpci_legacy_ioport_map(struct virtio_hw *hw);
+
extern const struct virtio_pci_ops legacy_ops;
extern const struct virtio_pci_ops modern_ops;
extern const struct virtio_pci_ops virtio_user_ops;
diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c
index a6d5e2e158..17342ae7d8 100644
--- a/drivers/net/virtio/virtio_pci_ethdev.c
+++ b/drivers/net/virtio/virtio_pci_ethdev.c
@@ -60,7 +60,7 @@ virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)
return -1;
}
} else {
- if (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)
+ if (vtpci_legacy_ioport_map(hw) < 0)
return -1;
}
@@ -109,7 +109,7 @@ eth_virtio_pci_init(struct rte_eth_dev *eth_dev)
err_unmap:
rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
if (!dev->modern)
- rte_pci_ioport_unmap(VTPCI_IO(hw));
+ vtpci_legacy_ioport_unmap(hw);
return ret;
}
--
2.29.2
next prev parent reply other threads:[~2020-12-20 21:19 UTC|newest]
Thread overview: 149+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-20 21:13 [dpdk-dev] [PATCH 00/40] net/virtio: Virtio PMD rework Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 01/40] bus/vdev: add helper to get vdev from eth dev Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:15 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 02/40] net/virtio: Introduce Virtio bus type Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:15 ` David Marchand
2021-01-14 9:24 ` Maxime Coquelin
2021-01-14 10:54 ` Maxime Coquelin
2021-01-14 11:55 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 03/40] net/virtio: refactor virtio-user device Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:16 ` David Marchand
2021-01-14 9:26 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 04/40] net/virtio: introduce PCI device metadata Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:16 ` David Marchand
2021-01-14 11:05 ` Maxime Coquelin
2021-01-14 14:40 ` David Marchand
2021-01-14 14:44 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 05/40] net/virtio: move PCI device init in dedicated file Maxime Coquelin
2020-12-30 3:02 ` Xia, Chenbo
2021-01-05 21:19 ` David Marchand
2021-01-14 16:04 ` Maxime Coquelin
2021-01-14 16:14 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 06/40] net/virtio: move PCI specific dev init to PCI ethdev init Maxime Coquelin
2020-12-30 3:05 ` Xia, Chenbo
2021-01-06 8:58 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 07/40] net/virtio: move MSIX detection to PCI ethdev Maxime Coquelin
2020-12-30 3:05 ` Xia, Chenbo
2021-01-06 8:22 ` David Marchand
2021-01-14 17:19 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 08/40] net/virtio: force IOVA as VA mode for Virtio-user Maxime Coquelin
2020-12-30 3:06 ` Xia, Chenbo
2021-01-06 9:06 ` David Marchand
2021-01-06 9:11 ` Thomas Monjalon
2021-01-06 9:22 ` Maxime Coquelin
2021-01-06 16:37 ` Kinsella, Ray
2021-01-06 9:14 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 09/40] net/virtio: store PCI type in Virtio device metadata Maxime Coquelin
2020-12-30 3:07 ` Xia, Chenbo
2021-01-06 9:14 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 10/40] net/virtio: add callback for device closing Maxime Coquelin
2020-12-30 3:07 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 11/40] net/virtio: validate features at bus level Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2021-01-15 9:20 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 12/40] net/virtio: remove bus type enum Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:33 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 13/40] net/virtio: move PCI-specific fields to PCI device Maxime Coquelin
2020-12-30 3:08 ` Xia, Chenbo
2021-01-06 9:58 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 14/40] net/virtio: pack virtio HW struct Maxime Coquelin
2020-12-30 3:09 ` Xia, Chenbo
2021-01-06 9:58 ` David Marchand
2021-01-15 9:35 ` Maxime Coquelin
2020-12-20 21:13 ` Maxime Coquelin [this message]
2020-12-30 3:09 ` [dpdk-dev] [PATCH 15/40] net/virtio: move legacy IO to Virtio PCI Xia, Chenbo
2021-01-06 10:09 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 16/40] net/virtio: introduce generic virtio header Maxime Coquelin
2020-12-30 3:09 ` Xia, Chenbo
2021-01-06 10:08 ` David Marchand
2021-01-15 9:39 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 17/40] net/virtio: move features definition to generic header Maxime Coquelin
2020-12-30 3:14 ` Xia, Chenbo
2021-01-14 8:40 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 18/40] net/virtio: move virtqueue defines in " Maxime Coquelin
2020-12-30 3:14 ` Xia, Chenbo
2021-01-06 15:53 ` David Marchand
2021-01-15 10:55 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 19/40] net/virtio: move config definitions to " Maxime Coquelin
2020-12-30 3:15 ` Xia, Chenbo
2021-01-06 16:01 ` David Marchand
2021-01-15 11:01 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 20/40] net/virtio: make interrupt handling more generic Maxime Coquelin
2020-12-30 3:17 ` Xia, Chenbo
2021-01-14 8:43 ` Maxime Coquelin
2021-01-06 16:07 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 21/40] net/virtio: move vring alignment to generic header Maxime Coquelin
2020-12-30 3:18 ` Xia, Chenbo
2021-01-06 16:13 ` David Marchand
2020-12-20 21:13 ` [dpdk-dev] [PATCH 22/40] net/virtio: remove last PCI refs in non-PCI code Maxime Coquelin
2020-12-30 3:25 ` Xia, Chenbo
2021-01-14 8:46 ` Maxime Coquelin
2021-01-06 16:18 ` David Marchand
2021-01-15 11:10 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 23/40] net/virtio: make Vhost-user req sender consistent Maxime Coquelin
2021-01-06 11:50 ` Xia, Chenbo
2021-01-15 9:47 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 24/40] net/virtio: add Virtio-user ops to set owner Maxime Coquelin
2021-01-06 11:50 ` Xia, Chenbo
2020-12-20 21:13 ` [dpdk-dev] [PATCH 25/40] net/virtio: add Virtio-user features ops Maxime Coquelin
2021-01-06 11:54 ` Xia, Chenbo
2021-01-13 13:43 ` Adrian Moreno
2021-01-13 13:54 ` Maxime Coquelin
2021-01-15 14:19 ` Maxime Coquelin
2021-01-13 13:57 ` Adrian Moreno
2021-01-15 14:29 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 26/40] net/virtio: add Virtio-user protocol " Maxime Coquelin
2021-01-06 11:55 ` Xia, Chenbo
2020-12-20 21:13 ` [dpdk-dev] [PATCH 27/40] net/virtio: add Virtio-user memory tables ops Maxime Coquelin
2021-01-06 11:57 ` Xia, Chenbo
2021-01-15 9:57 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 28/40] net/virtio: add Virtio-user vring setting ops Maxime Coquelin
2021-01-05 21:24 ` David Marchand
2021-01-06 12:01 ` Xia, Chenbo
2021-01-15 10:12 ` Maxime Coquelin
2021-01-06 12:03 ` Xia, Chenbo
2021-01-15 10:15 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 29/40] net/virtio: add Virtio-user vring file ops Maxime Coquelin
2021-01-05 21:24 ` David Marchand
2021-01-06 12:04 ` Xia, Chenbo
2021-01-15 10:17 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 30/40] net/virtio: add Virtio-user vring address ops Maxime Coquelin
2021-01-06 12:06 ` Xia, Chenbo
2021-01-15 10:19 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 31/40] net/virtio: add Virtio-user status ops Maxime Coquelin
2021-01-06 12:09 ` Xia, Chenbo
2021-01-15 10:48 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 32/40] net/virtio: remove useless request ops Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 33/40] net/virtio: improve Virtio-user errors handling Maxime Coquelin
2021-01-07 2:26 ` Xia, Chenbo
2021-01-15 11:09 ` Maxime Coquelin
2020-12-20 21:13 ` [dpdk-dev] [PATCH 34/40] net/virtio: move Vhost-user reqs to Vhost-user backend Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 35/40] net/virtio: make server mode blocking Maxime Coquelin
2021-01-07 3:20 ` Xia, Chenbo
2021-01-15 11:13 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 36/40] net/virtio: move protocol features to Vhost-user Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 37/40] net/virtio: introduce backend data Maxime Coquelin
2021-01-05 21:26 ` David Marchand
2021-01-13 17:18 ` Adrian Moreno
2021-01-15 16:49 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 38/40] net/virtio: move Vhost-user specifics to its backend Maxime Coquelin
2021-01-07 6:32 ` Xia, Chenbo
2021-01-15 12:03 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 39/40] net/virtio: move Vhost-kernel data " Maxime Coquelin
2021-01-07 6:42 ` Xia, Chenbo
2021-01-11 8:02 ` Xia, Chenbo
2021-01-15 11:54 ` Maxime Coquelin
2021-01-18 20:36 ` Maxime Coquelin
2020-12-20 21:14 ` [dpdk-dev] [PATCH 40/40] net/virtio: move Vhost-vDPA " Maxime Coquelin
2020-12-22 15:20 ` Maxime Coquelin
2021-01-07 6:50 ` Xia, Chenbo
2021-01-15 12:08 ` Maxime Coquelin
2021-01-11 8:05 ` Xia, Chenbo
2020-12-21 10:58 ` [dpdk-dev] [PATCH 00/40] net/virtio: Virtio PMD rework Maxime Coquelin
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=20201220211405.313012-16-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=amorenoz@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=olivier.matz@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).