From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 66C22A052A;
Mon, 25 Jan 2021 18:16:23 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4335D141036;
Mon, 25 Jan 2021 18:15:54 +0100 (CET)
Received: from us-smtp-delivery-124.mimecast.com
(us-smtp-delivery-124.mimecast.com [216.205.24.124])
by mails.dpdk.org (Postfix) with ESMTP id 72831141028
for <dev@dpdk.org>; Mon, 25 Jan 2021 18:15:49 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1611594948;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=oeBuFj3a19Igmd2cb60IjFZObmnBhMn4NWytrQS7EmY=;
b=SQfvXG6by+/TI+3uEX9pb10sCMIAMfk71YHsCvuqkynAun57t0YxG2/2VxH5bUQGrYB3HU
vzsHC0o8bNe1NdlRUuJtra1QqgGPc/Amj9exySSLw/NSL+xVBMusGFexzqaaI1EG9FrUg1
P/1Kv6xCeNCx1tz5Nwl7ArJyih964S0=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-429-4tGX-5VfPY-KeU9moNIqPw-1; Mon, 25 Jan 2021 12:15:43 -0500
X-MC-Unique: 4tGX-5VfPY-KeU9moNIqPw-1
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
[10.5.11.14])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D405C8049C4;
Mon, 25 Jan 2021 17:15:42 +0000 (UTC)
Received: from max-t490s.redhat.com (unknown [10.36.110.31])
by smtp.corp.redhat.com (Postfix) with ESMTP id 6895B5D9DB;
Mon, 25 Jan 2021 17:15:41 +0000 (UTC)
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>
Date: Mon, 25 Jan 2021 18:14:08 +0100
Message-Id: <20210125171444.167241-9-maxime.coquelin@redhat.com>
In-Reply-To: <20210125171444.167241-1-maxime.coquelin@redhat.com>
References: <20210125171444.167241-1-maxime.coquelin@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
Authentication-Results: relay.mimecast.com;
auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
Subject: [dpdk-dev] [PATCH v3 08/44] net/virtio: move PCI specific dev init
to PCI ethdev init
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
This patch moves the PCI specific initialization from
eth_virtio_dev_init() to eth_virtio_pci_init().
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/virtio/virtio_ethdev.c | 63 +----------------------
drivers/net/virtio/virtio_pci_ethdev.c | 71 +++++++++++++++++++++++++-
2 files changed, 71 insertions(+), 63 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ad7e9efd5f..a3e81f336d 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1676,7 +1676,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
struct virtio_hw *hw = eth_dev->data->dev_private;
struct virtio_net_config *config;
struct virtio_net_config local_config;
- struct rte_pci_device *pci_dev = NULL;
int ret;
/* Reset the device although not necessary at startup */
@@ -1697,9 +1696,6 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
hw->weak_barriers = !vtpci_with_feature(hw, VIRTIO_F_ORDER_PLATFORM);
- if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN)
- pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-
/* If host does not support both status and MSI-X then disable LSC */
if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS) &&
hw->use_msix != VIRTIO_MSIX_NONE)
@@ -1828,45 +1824,9 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features)
vtpci_reinit_complete(hw);
- if (pci_dev)
- PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x",
- eth_dev->data->port_id, pci_dev->id.vendor_id,
- pci_dev->id.device_id);
-
return 0;
}
-/*
- * Remap the PCI device again (IO port map for legacy device and
- * memory map for modern device), so that the secondary process
- * could have the PCI initiated correctly.
- */
-static int
-virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)
-{
- if (hw->bus_type == VIRTIO_BUS_PCI_MODERN) {
- /*
- * We don't have to re-parse the PCI config space, since
- * rte_pci_map_device() makes sure the mapped address
- * in secondary process would equal to the one mapped in
- * the primary process: error will be returned if that
- * requirement is not met.
- *
- * That said, we could simply reuse all cap pointers
- * (such as dev_cfg, common_cfg, etc.) parsed from the
- * primary process, which is stored in shared memory.
- */
- if (rte_pci_map_device(pci_dev)) {
- PMD_INIT_LOG(DEBUG, "failed to map pci device!");
- return -1;
- }
- } else if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {
- if (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)
- return -1;
- }
-
- return 0;
-}
static void
virtio_set_vtpci_ops(struct virtio_hw *hw)
@@ -1909,17 +1869,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->rx_descriptor_done = virtio_dev_rx_queue_done;
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
- if (hw->bus_type != VIRTIO_BUS_USER) {
- ret = virtio_remap_pci(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
- if (ret)
- return ret;
- }
-
virtio_set_vtpci_ops(hw);
set_rxtx_funcs(eth_dev);
-
return 0;
}
+
ret = virtio_dev_devargs_parse(eth_dev->device->devargs, &speed, &vectorized);
if (ret < 0)
return ret;
@@ -1936,15 +1890,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
}
hw->port_id = eth_dev->data->port_id;
- /* For virtio_user case the hw->virtio_user_dev is populated by
- * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called.
- */
- if (hw->bus_type != VIRTIO_BUS_USER) {
- ret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
- if (ret)
- goto err_vtpci_init;
- }
-
rte_spinlock_init(&hw->state_lock);
/* reset device and negotiate default features */
@@ -1971,12 +1916,6 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
return 0;
err_virtio_init:
- if (hw->bus_type == VIRTIO_BUS_PCI_MODERN || hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {
- rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
- if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)
- rte_pci_ioport_unmap(VTPCI_IO(hw));
- }
-err_vtpci_init:
rte_free(eth_dev->data->mac_addrs);
eth_dev->data->mac_addrs = NULL;
return ret;
diff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c
index 7c849d01ec..6a0ef6edc3 100644
--- a/drivers/net/virtio/virtio_pci_ethdev.c
+++ b/drivers/net/virtio/virtio_pci_ethdev.c
@@ -32,10 +32,79 @@ static const struct rte_pci_id pci_id_virtio_map[] = {
{ .vendor_id = 0, /* sentinel */ },
};
+
+/*
+ * Remap the PCI device again (IO port map for legacy device and
+ * memory map for modern device), so that the secondary process
+ * could have the PCI initiated correctly.
+ */
+static int
+virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_hw *hw)
+{
+ if (hw->bus_type == VIRTIO_BUS_PCI_MODERN) {
+ /*
+ * We don't have to re-parse the PCI config space, since
+ * rte_pci_map_device() makes sure the mapped address
+ * in secondary process would equal to the one mapped in
+ * the primary process: error will be returned if that
+ * requirement is not met.
+ *
+ * That said, we could simply reuse all cap pointers
+ * (such as dev_cfg, common_cfg, etc.) parsed from the
+ * primary process, which is stored in shared memory.
+ */
+ if (rte_pci_map_device(pci_dev)) {
+ PMD_INIT_LOG(DEBUG, "failed to map pci device!");
+ return -1;
+ }
+ } else if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY) {
+ if (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
static int
eth_virtio_pci_init(struct rte_eth_dev *eth_dev)
{
- return eth_virtio_dev_init(eth_dev);
+ struct virtio_pci_dev *dev = eth_dev->data->dev_private;
+ struct virtio_hw *hw = &dev->hw;
+ struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+ int ret;
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ ret = vtpci_init(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
+ if (ret) {
+ PMD_INIT_LOG(ERR, "Failed to init PCI device\n");
+ return -1;
+ }
+ } else {
+ ret = virtio_remap_pci(RTE_ETH_DEV_TO_PCI(eth_dev), hw);
+ if (ret < 0) {
+ PMD_INIT_LOG(ERR, "Failed to remap PCI device\n");
+ return -1;
+ }
+ }
+
+ ret = eth_virtio_dev_init(eth_dev);
+ if (ret < 0) {
+ PMD_INIT_LOG(ERR, "Failed to init virtio device\n");
+ goto err_unmap;
+ }
+
+ PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x",
+ eth_dev->data->port_id, pci_dev->id.vendor_id,
+ pci_dev->id.device_id);
+
+ return 0;
+
+err_unmap:
+ rte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));
+ if (hw->bus_type == VIRTIO_BUS_PCI_LEGACY)
+ rte_pci_ioport_unmap(VTPCI_IO(hw));
+
+ return ret;
}
static int
--
2.29.2