Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80512/?format=api
{ "id": 80512, "url": "http://patches.dpdk.org/api/patches/80512/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1602596753-32282-12-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "http://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": "<1602596753-32282-12-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1602596753-32282-12-git-send-email-arybchenko@solarflare.com", "date": "2020-10-13T13:45:28", "name": "[11/36] net/sfc: use BAR layout discovery to find control window", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d9a5af1d98e03076592a3a43e03fe62b2d476fc9", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1602596753-32282-12-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12916, "url": "http://patches.dpdk.org/api/series/12916/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12916", "date": "2020-10-13T13:45:18", "name": "net/sfc: add EF100 support", "version": 1, "mbox": "http://patches.dpdk.org/series/12916/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/80512/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/80512/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 4589FA04B7;\n\tTue, 13 Oct 2020 15:46:47 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AD4021DB96;\n\tTue, 13 Oct 2020 15:46:10 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id F3FDC1DB65\n for <dev@dpdk.org>; Tue, 13 Oct 2020 15:46:01 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.144])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 9867D200AC for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:00 +0000 (UTC)", "from us4-mdac16-66.at1.mdlocal (unknown [10.110.50.157])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 956DE800A9\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:00 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.49.106])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 277804004D\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:00 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n E411EB4005B\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:45:59 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Tue, 13 Oct 2020 14:45:56 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Tue, 13 Oct 2020 14:45:55 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09DDjtEQ006024;\n Tue, 13 Oct 2020 14:45:55 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id CC50D1613A9;\n Tue, 13 Oct 2020 14:45:55 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Igor Romanov <igor.romanov@oktetlabs.ru>", "Date": "Tue, 13 Oct 2020 14:45:28 +0100", "Message-ID": "<1602596753-32282-12-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1602596753-32282-1-git-send-email-arybchenko@solarflare.com>", "References": "<1602596753-32282-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25722.003", "X-TM-AS-Result": "No-3.302600-8.000000-10", "X-TMASE-MatchedRID": "Y83hn0DnaZGbII6cSoXysy2416nc3bQleouvej40T4gd0WOKRkwsh3Io\n zGa69omdrdoLblq9S5rUlUXqI6dEdRNhZ/XJyO6X0T5D1Qq6pCeOyyNQcbdhxFIxScKXZnK07gv\n kCk1wk/MSWSCVqBgOVMbAu3Spv/frMbO7pRnSf74vLP1C8DIeOti5W7Rf+s6QHnddRfSLChRfMR\n ZFmBPqiM9C3Lx6G+XHdyBPtYWfzvb+9ZBF4vV8lQlpVkdtt3Wujs/yyyVHGh50FoS1aixTNXjaz\n XnP+4i4D6Q5DylvBNGAMuqetGVetnyef22ep6XYxlblqLlYqXIHXDkoStbXGOaoE3qJsHkkbJ6f\n dT5cK65jl1ZJDvn1uNwHCmFeeHCiOpaYc79cd6agNf/lQC5puUZUjbXbCgcHB7+PYwfsXKDw7Jx\n wU0EvZMqEROLb/+yO4/0Jvn0rwAJmtL4Dw+zNb9T2H03zzU1J", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--3.302600-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25722.003", "X-MDID": "1602596760-O7JPSsKyjJ2C", "X-PPE-DISP": "1602596760;O7JPSsKyjJ2C", "Subject": "[dpdk-dev] [PATCH 11/36] net/sfc: use BAR layout discovery to find\n\tcontrol window", "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": "From: Igor Romanov <igor.romanov@oktetlabs.ru>\n\nControl window is required to talk to NIC.\n\nSigned-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/common/sfc_efx/efsys.h | 8 +++-\n drivers/net/sfc/meson.build | 2 +-\n drivers/net/sfc/sfc.c | 77 +++++++++++++++++++++++++++++-----\n 3 files changed, 75 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h\nindex 530dd7097d..f7d5f8a060 100644\n--- a/drivers/common/sfc_efx/efsys.h\n+++ b/drivers/common/sfc_efx/efsys.h\n@@ -163,7 +163,7 @@ prefetch_read_once(const volatile void *addr)\n \n #define EFSYS_OPT_MCDI_PROXY_AUTH_SERVER 0\n \n-#define EFSYS_OPT_PCI 0\n+#define EFSYS_OPT_PCI 1\n \n #define EFSYS_OPT_DESC_PROXY 0\n \n@@ -741,6 +741,12 @@ typedef uint64_t\tefsys_stat_t;\n \n #define EFSYS_HAS_ROTL_DWORD\t0\n \n+/* PCI */\n+\n+typedef struct efsys_pci_config_s {\n+\tstruct rte_pci_device\t*espc_dev;\n+} efsys_pci_config_t;\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build\nindex 1c6451938a..304e8686e5 100644\n--- a/drivers/net/sfc/meson.build\n+++ b/drivers/net/sfc/meson.build\n@@ -33,7 +33,7 @@ foreach flag: extra_flags\n \tendif\n endforeach\n \n-deps += ['common_sfc_efx']\n+deps += ['common_sfc_efx', 'bus_pci']\n sources = files(\n \t'sfc_ethdev.c',\n \t'sfc_kvargs.c',\ndiff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 4f1fd0c695..559f9039c2 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -626,16 +626,40 @@ sfc_close(struct sfc_adapter *sa)\n \tsfc_log_init(sa, \"done\");\n }\n \n+static efx_rc_t\n+sfc_find_mem_bar(efsys_pci_config_t *configp, int bar_index,\n+\t\t efsys_bar_t *barp)\n+{\n+\tefsys_bar_t result;\n+\tstruct rte_pci_device *dev;\n+\n+\tmemset(&result, 0, sizeof(result));\n+\n+\tif (bar_index < 0 || bar_index >= PCI_MAX_RESOURCE)\n+\t\treturn EINVAL;\n+\n+\tdev = configp->espc_dev;\n+\n+\tresult.esb_rid = bar_index;\n+\tresult.esb_dev = dev;\n+\tresult.esb_base = dev->mem_resource[bar_index].addr;\n+\n+\t*barp = result;\n+\n+\treturn 0;\n+}\n+\n static int\n-sfc_mem_bar_init(struct sfc_adapter *sa, unsigned int membar)\n+sfc_mem_bar_init(struct sfc_adapter *sa, const efx_bar_region_t *mem_ebrp)\n {\n \tstruct rte_eth_dev *eth_dev = sa->eth_dev;\n \tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n \tefsys_bar_t *ebp = &sa->mem_bar;\n-\tstruct rte_mem_resource *res = &pci_dev->mem_resource[membar];\n+\tstruct rte_mem_resource *res =\n+\t\t&pci_dev->mem_resource[mem_ebrp->ebr_index];\n \n \tSFC_BAR_LOCK_INIT(ebp, eth_dev->data->name);\n-\tebp->esb_rid = membar;\n+\tebp->esb_rid = mem_ebrp->ebr_index;\n \tebp->esb_dev = pci_dev;\n \tebp->esb_base = res->addr;\n \treturn 0;\n@@ -1053,11 +1077,43 @@ sfc_nic_probe(struct sfc_adapter *sa)\n \treturn 0;\n }\n \n+static efx_rc_t\n+sfc_pci_config_readd(efsys_pci_config_t *configp, uint32_t offset,\n+\t\t efx_dword_t *edp)\n+{\n+\tint rc;\n+\n+\trc = rte_pci_read_config(configp->espc_dev, edp->ed_u32, sizeof(*edp),\n+\t\t\t\t offset);\n+\n+\treturn (rc < 0 || rc != sizeof(*edp)) ? EIO : 0;\n+}\n+\n+static int\n+sfc_family(struct sfc_adapter *sa, efx_bar_region_t *mem_ebrp)\n+{\n+\tstruct rte_eth_dev *eth_dev = sa->eth_dev;\n+\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);\n+\tefsys_pci_config_t espcp;\n+\tstatic const efx_pci_ops_t ops = {\n+\t\t.epo_config_readd = sfc_pci_config_readd,\n+\t\t.epo_find_mem_bar = sfc_find_mem_bar,\n+\t};\n+\tint rc;\n+\n+\tespcp.espc_dev = pci_dev;\n+\n+\trc = efx_family_probe_bar(pci_dev->id.vendor_id,\n+\t\t\t\t pci_dev->id.device_id,\n+\t\t\t\t &espcp, &ops, &sa->family, mem_ebrp);\n+\n+\treturn rc;\n+}\n+\n int\n sfc_probe(struct sfc_adapter *sa)\n {\n-\tstruct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(sa->eth_dev);\n-\tunsigned int membar;\n+\tefx_bar_region_t mem_ebrp;\n \tefx_nic_t *enp;\n \tint rc;\n \n@@ -1069,21 +1125,22 @@ sfc_probe(struct sfc_adapter *sa)\n \trte_atomic32_init(&sa->restart_required);\n \n \tsfc_log_init(sa, \"get family\");\n-\trc = efx_family(pci_dev->id.vendor_id, pci_dev->id.device_id,\n-\t\t\t&sa->family, &membar);\n+\trc = sfc_family(sa, &mem_ebrp);\n \tif (rc != 0)\n \t\tgoto fail_family;\n-\tsfc_log_init(sa, \"family is %u, membar is %u\", sa->family, membar);\n+\tsfc_log_init(sa,\n+\t\t \"family is %u, membar is %u, function control window offset is %lu\",\n+\t\t sa->family, mem_ebrp.ebr_index, mem_ebrp.ebr_offset);\n \n \tsfc_log_init(sa, \"init mem bar\");\n-\trc = sfc_mem_bar_init(sa, membar);\n+\trc = sfc_mem_bar_init(sa, &mem_ebrp);\n \tif (rc != 0)\n \t\tgoto fail_mem_bar_init;\n \n \tsfc_log_init(sa, \"create nic\");\n \trte_spinlock_init(&sa->nic_lock);\n \trc = efx_nic_create(sa->family, (efsys_identifier_t *)sa,\n-\t\t\t &sa->mem_bar, 0,\n+\t\t\t &sa->mem_bar, mem_ebrp.ebr_offset,\n \t\t\t &sa->nic_lock, &enp);\n \tif (rc != 0)\n \t\tgoto fail_nic_create;\n", "prefixes": [ "11/36" ] }