Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/89132/?format=api
{ "id": 89132, "url": "https://patches.dpdk.org/api/patches/89132/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210315135823.605774-9-andrew.rybchenko@oktetlabs.ru/", "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": "<20210315135823.605774-9-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210315135823.605774-9-andrew.rybchenko@oktetlabs.ru", "date": "2021-03-15T13:58:23", "name": "[v2,8/8] drivers: add common driver API to get efx family", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "ef73c5b666c8df191211a6118e3f16524996abaa", "submitter": { "id": 2013, "url": "https://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210315135823.605774-9-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 15659, "url": "https://patches.dpdk.org/api/series/15659/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=15659", "date": "2021-03-15T13:58:15", "name": "common/sfc_efx: prepare to introduce vDPA driver", "version": 2, "mbox": "https://patches.dpdk.org/series/15659/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/89132/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/89132/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id E49BDA054F;\n\tMon, 15 Mar 2021 15:01:04 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C543A2426A4;\n\tMon, 15 Mar 2021 15:00:12 +0100 (CET)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id F2049242672\n for <dev@dpdk.org>; Mon, 15 Mar 2021 15:00:10 +0100 (CET)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id C72E87F5BC; Mon, 15 Mar 2021 17:00:10 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id 51F727F5BD;\n Mon, 15 Mar 2021 16:59:48 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 51F727F5BD", "Authentication-Results": "shelob.oktetlabs.ru/51F727F5BD; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "Ferruh Yigit <ferruh.yigit@intel.com>", "Cc": "dev@dpdk.org,\n\tVijay Kumar Srivastava <vsrivast@xilinx.com>", "Date": "Mon, 15 Mar 2021 16:58:23 +0300", "Message-Id": "<20210315135823.605774-9-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.1", "In-Reply-To": "<20210315135823.605774-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210311110325.3291203-1-andrew.rybchenko@oktetlabs.ru>\n <20210315135823.605774-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 8/8] drivers: add common driver API to get efx\n family", "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>,\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: Vijay Kumar Srivastava <vsrivast@xilinx.com>\n\nMove function to get efx family from net driver into common driver.\n\nSigned-off-by: Vijay Kumar Srivastava <vsrivast@xilinx.com>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n drivers/common/meson.build | 2 +-\n drivers/common/sfc_efx/meson.build | 5 +++\n drivers/common/sfc_efx/sfc_efx.c | 56 +++++++++++++++++++++++++++\n drivers/common/sfc_efx/sfc_efx.h | 10 +++++\n drivers/common/sfc_efx/version.map | 1 +\n drivers/meson.build | 1 +\n drivers/net/sfc/sfc.c | 61 ++----------------------------\n 7 files changed, 78 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/common/meson.build b/drivers/common/meson.build\nindex ba6325adf3..66e12143b2 100644\n--- a/drivers/common/meson.build\n+++ b/drivers/common/meson.build\n@@ -6,4 +6,4 @@ if is_windows\n endif\n \n std_deps = ['eal']\n-drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx']\n+drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2']\ndiff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build\nindex d9afcf3eeb..9faf5161f5 100644\n--- a/drivers/common/sfc_efx/meson.build\n+++ b/drivers/common/sfc_efx/meson.build\n@@ -5,6 +5,10 @@\n # This software was jointly developed between OKTET Labs (under contract\n # for Solarflare) and Solarflare Communications, Inc.\n \n+if is_windows\n+\tsubdir_done()\n+endif\n+\n if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))\n \tbuild = false\n \treason = 'only supported on x86_64 and aarch64'\n@@ -32,6 +36,7 @@ endforeach\n subdir('base')\n objs = [base_objs]\n \n+deps += ['bus_pci']\n sources = files(\n \t'sfc_efx.c',\n \t'sfc_efx_mcdi.c',\ndiff --git a/drivers/common/sfc_efx/sfc_efx.c b/drivers/common/sfc_efx/sfc_efx.c\nindex a3146db255..0b78933d9f 100644\n--- a/drivers/common/sfc_efx/sfc_efx.c\n+++ b/drivers/common/sfc_efx/sfc_efx.c\n@@ -62,6 +62,62 @@ sfc_efx_dev_class_get(struct rte_devargs *devargs)\n \treturn dev_class;\n }\n \n+static efx_rc_t\n+sfc_efx_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 efx_rc_t\n+sfc_efx_pci_config_readd(efsys_pci_config_t *configp, uint32_t offset,\n+\t\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+int\n+sfc_efx_family(struct rte_pci_device *pci_dev,\n+\t efx_bar_region_t *mem_ebrp, efx_family_t *family)\n+{\n+\tstatic const efx_pci_ops_t ops = {\n+\t\t.epo_config_readd = sfc_efx_pci_config_readd,\n+\t\t.epo_find_mem_bar = sfc_efx_find_mem_bar,\n+\t};\n+\n+\tefsys_pci_config_t espcp;\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, family, mem_ebrp);\n+\n+\treturn rc;\n+}\n+\n RTE_INIT(sfc_efx_register_logtype)\n {\n \tint ret;\ndiff --git a/drivers/common/sfc_efx/sfc_efx.h b/drivers/common/sfc_efx/sfc_efx.h\nindex bbccd3e9e8..71288b7299 100644\n--- a/drivers/common/sfc_efx/sfc_efx.h\n+++ b/drivers/common/sfc_efx/sfc_efx.h\n@@ -10,6 +10,11 @@\n #ifndef _SFC_EFX_H_\n #define _SFC_EFX_H_\n \n+#include <rte_bus_pci.h>\n+\n+#include \"efx.h\"\n+#include \"efsys.h\"\n+\n #ifdef __cplusplus\n extern \"C\" {\n #endif\n@@ -27,6 +32,11 @@ enum sfc_efx_dev_class {\n __rte_internal\n enum sfc_efx_dev_class sfc_efx_dev_class_get(struct rte_devargs *devargs);\n \n+__rte_internal\n+int sfc_efx_family(struct rte_pci_device *pci_dev,\n+\t\t efx_bar_region_t *mem_ebrp,\n+\t\t efx_family_t *family);\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/drivers/common/sfc_efx/version.map b/drivers/common/sfc_efx/version.map\nindex a3345d34f7..c3414b760b 100644\n--- a/drivers/common/sfc_efx/version.map\n+++ b/drivers/common/sfc_efx/version.map\n@@ -222,6 +222,7 @@ INTERNAL {\n \tefx_txq_size;\n \n \tsfc_efx_dev_class_get;\n+\tsfc_efx_family;\n \n \tsfc_efx_mcdi_init;\n \tsfc_efx_mcdi_fini;\ndiff --git a/drivers/meson.build b/drivers/meson.build\nindex fdf76120ac..9c8eded697 100644\n--- a/drivers/meson.build\n+++ b/drivers/meson.build\n@@ -7,6 +7,7 @@ subdirs = [\n \t'bus',\n \t'common/mlx5', # depends on bus.\n \t'common/qat', # depends on bus.\n+\t'common/sfc_efx', # depends on bus.\n \t'mempool', # depends on common and bus.\n \t'net', # depends on common, bus, mempool\n \t'raw', # depends on common, bus and net.\ndiff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c\nindex 3135068c39..3477c7530b 100644\n--- a/drivers/net/sfc/sfc.c\n+++ b/drivers/net/sfc/sfc.c\n@@ -631,29 +631,6 @@ 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, const efx_bar_region_t *mem_ebrp)\n {\n@@ -1095,43 +1072,12 @@ 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 \tefx_bar_region_t mem_ebrp;\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 \tefx_nic_t *enp;\n \tint rc;\n \n@@ -1143,7 +1089,8 @@ sfc_probe(struct sfc_adapter *sa)\n \trte_atomic32_init(&sa->restart_required);\n \n \tsfc_log_init(sa, \"get family\");\n-\trc = sfc_family(sa, &mem_ebrp);\n+\trc = sfc_efx_family(pci_dev, &mem_ebrp, &sa->family);\n+\n \tif (rc != 0)\n \t\tgoto fail_family;\n \tsfc_log_init(sa,\n", "prefixes": [ "v2", "8/8" ] }