Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85539/?format=api
https://patches.dpdk.org/api/patches/85539/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201220211405.313012-16-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20201220211405.313012-16-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201220211405.313012-16-maxime.coquelin@redhat.com", "date": "2020-12-20T21:13:40", "name": "[15/40] net/virtio: move legacy IO to Virtio PCI", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "670d8a275c1aa50eac9cbd0ec734d2cefcbf0d79", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201220211405.313012-16-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14390, "url": "https://patches.dpdk.org/api/series/14390/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14390", "date": "2020-12-20T21:13:25", "name": "net/virtio: Virtio PMD rework", "version": 1, "mbox": "https://patches.dpdk.org/series/14390/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/85539/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/85539/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 12B72A09FD;\n\tSun, 20 Dec 2020 22:19:21 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 1F7ECCD60;\n\tSun, 20 Dec 2020 22:15:22 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [63.128.21.124])\n by dpdk.org (Postfix) with ESMTP id 4FC54CD38\n for <dev@dpdk.org>; Sun, 20 Dec 2020 22:15:19 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-526-OdoGq5r8OmalnNZGeWbuOA-1; Sun, 20 Dec 2020 16:15:14 -0500", "from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com\n [10.5.11.12])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A9E11005E40;\n Sun, 20 Dec 2020 21:15:13 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.43])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 5842E60C43;\n Sun, 20 Dec 2020 21:15:11 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1608498917;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ZncbNRPq7/ZKlPSWBDfskf/HkdwhT7ONRE/y4YME6kw=;\n b=QYXFWr9A7SLZiS2b0Ac3tQ1BZ2HPY0EnC2SRbJxMpT9+bFSsFZRVFXGVUv7scNVtWUErxG\n nRgKAyjXhqSaR5KymVPEEVWQjnidI+R16xCllHn3Q2GZQHts2I1CeoQzoSN/1v2Vx4vgwP\n d8yRJzIaU0CCCWWXjWe8XvYdUls7S9E=", "X-MC-Unique": "OdoGq5r8OmalnNZGeWbuOA-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,\n amorenoz@redhat.com, david.marchand@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Sun, 20 Dec 2020 22:13:40 +0100", "Message-Id": "<20201220211405.313012-16-maxime.coquelin@redhat.com>", "In-Reply-To": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "References": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "Authentication-Results": "relay.mimecast.com;\n 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 15/40] net/virtio: move legacy IO to Virtio PCI", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch moves Virtio PCI legacy IO handling to\nvirtio_pci.c. Two functions are created so that\nvirtio_pci_ethdev does not have to care about it.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/virtio_pci.c | 21 +++++++++++++++++++++\n drivers/net/virtio/virtio_pci.h | 6 +++---\n drivers/net/virtio/virtio_pci_ethdev.c | 4 ++--\n 3 files changed, 26 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex 8c62507a0a..230a438bf7 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -31,6 +31,15 @@\n #define VIRTIO_PCI_CONFIG(hw) \\\n \t\t(((hw)->use_msix == VIRTIO_MSIX_ENABLED) ? 24 : 20)\n \n+\n+struct virtio_pci_internal {\n+\tstruct rte_pci_ioport io;\n+};\n+\n+#define VTPCI_IO(hw) (&virtio_pci_internal[(hw)->port_id].io)\n+\n+struct virtio_pci_internal virtio_pci_internal[RTE_MAX_ETHPORTS];\n+\n static inline int\n check_vq_phys_addr_ok(struct virtqueue *vq)\n {\n@@ -838,3 +847,15 @@ vtpci_msix_detect(struct rte_pci_device *dev)\n \n \treturn VIRTIO_MSIX_NONE;\n }\n+\n+void vtpci_legacy_ioport_unmap(struct virtio_hw *hw)\n+{\n+\trte_pci_ioport_unmap(VTPCI_IO(hw));\n+}\n+\n+int vtpci_legacy_ioport_map(struct virtio_hw *hw)\n+{\n+\tstruct virtio_pci_dev *dev = virtio_pci_get_dev(hw);\n+\n+\treturn rte_pci_ioport_map(dev->pci_dev, 0, VTPCI_IO(hw));\n+}\ndiff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h\nindex 15f68f141c..c3db36d2fc 100644\n--- a/drivers/net/virtio/virtio_pci.h\n+++ b/drivers/net/virtio/virtio_pci.h\n@@ -297,15 +297,12 @@ struct virtio_pci_dev {\n */\n struct virtio_hw_internal {\n \tconst struct virtio_pci_ops *vtpci_ops;\n-\tstruct rte_pci_ioport io;\n };\n \n #define VTPCI_OPS(hw)\t(virtio_hw_internal[(hw)->port_id].vtpci_ops)\n-#define VTPCI_IO(hw)\t(&virtio_hw_internal[(hw)->port_id].io)\n \n extern struct virtio_hw_internal virtio_hw_internal[RTE_MAX_ETHPORTS];\n \n-\n /*\n * This structure is just a reference to read\n * net device specific config space; it just a chodu structure\n@@ -380,6 +377,9 @@ uint8_t vtpci_isr(struct virtio_hw *);\n \n enum virtio_msix_status vtpci_msix_detect(struct rte_pci_device *dev);\n \n+void vtpci_legacy_ioport_unmap(struct virtio_hw *hw);\n+int vtpci_legacy_ioport_map(struct virtio_hw *hw);\n+\n extern const struct virtio_pci_ops legacy_ops;\n extern const struct virtio_pci_ops modern_ops;\n extern const struct virtio_pci_ops virtio_user_ops;\ndiff --git a/drivers/net/virtio/virtio_pci_ethdev.c b/drivers/net/virtio/virtio_pci_ethdev.c\nindex a6d5e2e158..17342ae7d8 100644\n--- a/drivers/net/virtio/virtio_pci_ethdev.c\n+++ b/drivers/net/virtio/virtio_pci_ethdev.c\n@@ -60,7 +60,7 @@ virtio_remap_pci(struct rte_pci_device *pci_dev, struct virtio_pci_dev *dev)\n \t\t\treturn -1;\n \t\t}\n \t} else {\n-\t\tif (rte_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)\n+\t\tif (vtpci_legacy_ioport_map(hw) < 0)\n \t\t\treturn -1;\n \t}\n \n@@ -109,7 +109,7 @@ eth_virtio_pci_init(struct rte_eth_dev *eth_dev)\n err_unmap:\n \trte_pci_unmap_device(RTE_ETH_DEV_TO_PCI(eth_dev));\n \tif (!dev->modern)\n-\t\trte_pci_ioport_unmap(VTPCI_IO(hw));\n+\t\tvtpci_legacy_ioport_unmap(hw);\n \n \treturn ret;\n }\n", "prefixes": [ "15/40" ] }{ "id": 85539, "url": "