Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/57310/?format=api
{ "id": 57310, "url": "http://patchwork.dpdk.org/api/patches/57310/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1564556752-19257-13-git-send-email-rosen.xu@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<1564556752-19257-13-git-send-email-rosen.xu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1564556752-19257-13-git-send-email-rosen.xu@intel.com", "date": "2019-07-31T07:05:52", "name": "[12/12] net/ipn3ke: remove configuration for i40e port bonding", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "c047708c8a5860bd08f39dedd25e131fdb7edbcb", "submitter": { "id": 946, "url": "http://patchwork.dpdk.org/api/people/946/?format=api", "name": "Xu, Rosen", "email": "rosen.xu@intel.com" }, "delegate": { "id": 1540, "url": "http://patchwork.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1564556752-19257-13-git-send-email-rosen.xu@intel.com/mbox/", "series": [ { "id": 5846, "url": "http://patchwork.dpdk.org/api/series/5846/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=5846", "date": "2019-07-31T07:05:40", "name": "Add PCIe AER disable and IRQ support for ipn3ke", "version": 1, "mbox": "http://patchwork.dpdk.org/series/5846/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/57310/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/57310/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id F25841C19B;\n\tWed, 31 Jul 2019 09:05:51 +0200 (CEST)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby dpdk.org (Postfix) with ESMTP id 3169A1C12B\n\tfor <dev@dpdk.org>; Wed, 31 Jul 2019 09:05:41 +0200 (CEST)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t31 Jul 2019 00:05:40 -0700", "from dpdk-rosen-02.sh.intel.com ([10.67.111.116])\n\tby orsmga006.jf.intel.com with ESMTP; 31 Jul 2019 00:05:39 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,329,1559545200\"; d=\"scan'208\";a=\"177215566\"", "From": "Rosen Xu <rosen.xu@intel.com>", "To": "dev@dpdk.org", "Cc": "ferruh.yigit@intel.com, tianfei.zhang@intel.com, rosen.xu@intel.com,\n\tandy.pei@intel.com, david.lomartire@intel.com, qi.z.zhang@intel.com", "Date": "Wed, 31 Jul 2019 15:05:52 +0800", "Message-Id": "<1564556752-19257-13-git-send-email-rosen.xu@intel.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1564556752-19257-1-git-send-email-rosen.xu@intel.com>", "References": "<1564556752-19257-1-git-send-email-rosen.xu@intel.com>", "Subject": "[dpdk-dev] [PATCH 12/12] net/ipn3ke: remove configuration for i40e\n\tport bonding", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The ipn3ke board FPGA and i40e BDF scan has added in ifpga_rawdev,\nso it doesn't need to provide configuration for i40e port bonding.\n\nSigned-off-by: Rosen Xu <rosen.xu@intel.com>\n---\n drivers/net/ipn3ke/Makefile | 2 +\n drivers/net/ipn3ke/ipn3ke_ethdev.c | 289 ++++----------------------------\n drivers/net/ipn3ke/ipn3ke_representor.c | 7 +-\n 3 files changed, 43 insertions(+), 255 deletions(-)", "diff": "diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile\nindex 8c3ae37..5478fd9 100644\n--- a/drivers/net/ipn3ke/Makefile\n+++ b/drivers/net/ipn3ke/Makefile\n@@ -19,6 +19,8 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API\n CFLAGS += -O3\n CFLAGS += $(WERROR_FLAGS)\n CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga\n+CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev\n+CFLAGS += -I$(RTE_SDK)/drivers/net/i40e\n LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring\n LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs\n LDLIBS += -lrte_bus_ifpga\ndiff --git a/drivers/net/ipn3ke/ipn3ke_ethdev.c b/drivers/net/ipn3ke/ipn3ke_ethdev.c\nindex c226d63..363a5f1 100644\n--- a/drivers/net/ipn3ke/ipn3ke_ethdev.c\n+++ b/drivers/net/ipn3ke/ipn3ke_ethdev.c\n@@ -19,6 +19,7 @@\n #include <rte_bus_ifpga.h>\n #include <ifpga_common.h>\n #include <ifpga_logs.h>\n+#include <ifpga_rawdev.h>\n \n #include \"ipn3ke_rawdev_api.h\"\n #include \"ipn3ke_flow.h\"\n@@ -241,7 +242,8 @@\n \t\t\t\t\"LineSideMACType\", &mac_type);\n \thw->retimer.mac_type = (int)mac_type;\n \n-\tIPN3KE_AFU_PMD_DEBUG(\"UPL_version is 0x%x\\n\", IPN3KE_READ_REG(hw, 0));\n+\thw->acc_tm = 0;\n+\thw->acc_flow = 0;\n \n \tif (afu_dev->id.uuid.uuid_low == IPN3KE_UUID_VBNG_LOW &&\n \t\tafu_dev->id.uuid.uuid_high == IPN3KE_UUID_VBNG_HIGH) {\n@@ -259,6 +261,12 @@\n \t\t/* After reset, wait until init done */\n \t\tif (ipn3ke_vbng_init_done(hw))\n \t\t\treturn -1;\n+\n+\t\thw->acc_tm = 1;\n+\t\thw->acc_flow = 1;\n+\n+\t\tIPN3KE_AFU_PMD_DEBUG(\"UPL_version is 0x%x\\n\",\n+\t\t\tIPN3KE_READ_REG(hw, 0));\n \t}\n \n \tif (hw->retimer.mac_type == IFPGA_RAWDEV_RETIMER_MAC_TYPE_10GE_XFI) {\n@@ -323,9 +331,6 @@\n \t\thw->flow_hw_enable = 1;\n \t}\n \n-\thw->acc_tm = 0;\n-\thw->acc_flow = 0;\n-\n \treturn 0;\n }\n \n@@ -376,7 +381,11 @@ static int ipn3ke_vswitch_probe(struct rte_afu_device *afu_dev)\n {\n \tchar name[RTE_ETH_NAME_MAX_LEN];\n \tstruct ipn3ke_hw *hw;\n-\tint i, retval;\n+\tstruct rte_eth_dev *i40e_eth;\n+\tstruct ifpga_rawdev *ifpga_dev;\n+\tuint16_t port_id;\n+\tint i, j, retval;\n+\tchar *fvl_bdf;\n \n \t/* check if the AFU device has been probed already */\n \t/* allocate shared mcp_vswitch structure */\n@@ -403,7 +412,12 @@ static int ipn3ke_vswitch_probe(struct rte_afu_device *afu_dev)\n \tif (retval)\n \t\treturn retval;\n \n+\tifpga_dev = ifpga_rawdev_get(hw->rawdev);\n+\t\tif (!ifpga_dev)\n+\t\t\tIPN3KE_AFU_PMD_ERR(\"failed to find ifpga_device.\");\n+\n \t/* probe representor ports */\n+\tj = 0;\n \tfor (i = 0; i < hw->port_num; i++) {\n \t\tstruct ipn3ke_rpst rpst = {\n \t\t\t.port_id = i,\n@@ -415,6 +429,22 @@ static int ipn3ke_vswitch_probe(struct rte_afu_device *afu_dev)\n \t\tsnprintf(name, sizeof(name), \"net_%s_representor_%d\",\n \t\t\tafu_dev->device.name, i);\n \n+\t\tfor (; j < 8; j++) {\n+\t\t\tfvl_bdf = ifpga_dev->fvl_bdf[j];\n+\t\t\tretval = rte_eth_dev_get_port_by_name(fvl_bdf,\n+\t\t\t\t&port_id);\n+\t\t\tif (retval) {\n+\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\ti40e_eth = &rte_eth_devices[port_id];\n+\t\t\t\trpst.i40e_pf_eth = i40e_eth;\n+\t\t\t\trpst.i40e_pf_eth_port_id = port_id;\n+\n+\t\t\t\tj++;\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n \t\tretval = rte_eth_dev_create(&afu_dev->device, name,\n \t\t\tsizeof(struct ipn3ke_rpst), NULL, NULL,\n \t\t\tipn3ke_rpst_init, &rpst);\n@@ -422,6 +452,7 @@ static int ipn3ke_vswitch_probe(struct rte_afu_device *afu_dev)\n \t\tif (retval)\n \t\t\tIPN3KE_AFU_PMD_ERR(\"failed to create ipn3ke representor %s.\",\n \t\t\t\t\t\t\t\tname);\n+\n \t}\n \n \treturn 0;\n@@ -467,254 +498,6 @@ static int ipn3ke_vswitch_remove(struct rte_afu_device *afu_dev)\n \n RTE_PMD_REGISTER_AFU(net_ipn3ke_afu, afu_ipn3ke_driver);\n \n-static const char * const valid_args[] = {\n-#define IPN3KE_AFU_NAME \"afu\"\n-\t\tIPN3KE_AFU_NAME,\n-#define IPN3KE_FPGA_ACCELERATION_LIST \"fpga_acc\"\n-\t\tIPN3KE_FPGA_ACCELERATION_LIST,\n-#define IPN3KE_I40E_PF_LIST \"i40e_pf\"\n-\t\tIPN3KE_I40E_PF_LIST,\n-\t\tNULL\n-};\n-\n-static int\n-ipn3ke_cfg_parse_acc_list(const char *afu_name,\n-\tconst char *acc_list_name)\n-{\n-\tstruct rte_afu_device *afu_dev;\n-\tstruct ipn3ke_hw *hw;\n-\tconst char *p_source;\n-\tchar *p_start;\n-\tchar name[RTE_ETH_NAME_MAX_LEN];\n-\n-\tafu_dev = rte_ifpga_find_afu_by_name(afu_name);\n-\tif (!afu_dev)\n-\t\treturn -1;\n-\thw = afu_dev->shared.data;\n-\tif (!hw)\n-\t\treturn -1;\n-\n-\tp_source = acc_list_name;\n-\twhile (*p_source) {\n-\t\twhile ((*p_source == '{') || (*p_source == '|'))\n-\t\t\tp_source++;\n-\t\tp_start = name;\n-\t\twhile ((*p_source != '|') && (*p_source != '}'))\n-\t\t\t*p_start++ = *p_source++;\n-\t\t*p_start = 0;\n-\t\tif (!strcmp(name, \"tm\") && hw->tm_hw_enable)\n-\t\t\thw->acc_tm = 1;\n-\n-\t\tif (!strcmp(name, \"flow\") && hw->flow_hw_enable)\n-\t\t\thw->acc_flow = 1;\n-\n-\t\tif (*p_source == '}')\n-\t\t\treturn 0;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-static int\n-ipn3ke_cfg_parse_i40e_pf_ethdev(const char *afu_name,\n-\tconst char *pf_name)\n-{\n-\tstruct rte_eth_dev *i40e_eth, *rpst_eth;\n-\tstruct rte_afu_device *afu_dev;\n-\tstruct ipn3ke_rpst *rpst;\n-\tstruct ipn3ke_hw *hw;\n-\tconst char *p_source;\n-\tchar *p_start;\n-\tchar name[RTE_ETH_NAME_MAX_LEN];\n-\tuint16_t port_id;\n-\tint i;\n-\tint ret = -1;\n-\n-\tafu_dev = rte_ifpga_find_afu_by_name(afu_name);\n-\tif (!afu_dev)\n-\t\treturn -1;\n-\thw = afu_dev->shared.data;\n-\tif (!hw)\n-\t\treturn -1;\n-\n-\tp_source = pf_name;\n-\tfor (i = 0; i < hw->port_num; i++) {\n-\t\tsnprintf(name, sizeof(name), \"net_%s_representor_%d\",\n-\t\t\tafu_name, i);\n-\t\tret = rte_eth_dev_get_port_by_name(name, &port_id);\n-\t\tif (ret)\n-\t\t\treturn -1;\n-\t\trpst_eth = &rte_eth_devices[port_id];\n-\t\trpst = IPN3KE_DEV_PRIVATE_TO_RPST(rpst_eth);\n-\n-\t\twhile ((*p_source == '{') || (*p_source == '|'))\n-\t\t\tp_source++;\n-\t\tp_start = name;\n-\t\twhile ((*p_source != '|') && (*p_source != '}'))\n-\t\t\t*p_start++ = *p_source++;\n-\t\t*p_start = 0;\n-\n-\t\tret = rte_eth_dev_get_port_by_name(name, &port_id);\n-\t\tif (ret)\n-\t\t\treturn -1;\n-\t\ti40e_eth = &rte_eth_devices[port_id];\n-\n-\t\trpst->i40e_pf_eth = i40e_eth;\n-\t\trpst->i40e_pf_eth_port_id = port_id;\n-\n-\t\tif ((*p_source == '}') || !(*p_source))\n-\t\t\tbreak;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-static int\n-ipn3ke_cfg_probe(struct rte_vdev_device *dev)\n-{\n-\tstruct rte_devargs *devargs;\n-\tstruct rte_kvargs *kvlist = NULL;\n-\tchar *afu_name = NULL;\n-\tchar *acc_name = NULL;\n-\tchar *pf_name = NULL;\n-\tint afu_name_en = 0;\n-\tint acc_list_en = 0;\n-\tint pf_list_en = 0;\n-\tint ret = -1;\n-\n-\tdevargs = dev->device.devargs;\n-\n-\tkvlist = rte_kvargs_parse(devargs->args, valid_args);\n-\tif (!kvlist) {\n-\t\tIPN3KE_AFU_PMD_ERR(\"error when parsing param\");\n-\t\tgoto end;\n-\t}\n-\n-\tif (rte_kvargs_count(kvlist, IPN3KE_AFU_NAME) == 1) {\n-\t\tif (rte_kvargs_process(kvlist, IPN3KE_AFU_NAME,\n-\t\t\t\t &rte_ifpga_get_string_arg,\n-\t\t\t\t &afu_name) < 0) {\n-\t\t\tIPN3KE_AFU_PMD_ERR(\"error to parse %s\",\n-\t\t\t\t IPN3KE_AFU_NAME);\n-\t\t\tgoto end;\n-\t\t} else {\n-\t\t\tafu_name_en = 1;\n-\t\t}\n-\t}\n-\n-\tif (rte_kvargs_count(kvlist, IPN3KE_FPGA_ACCELERATION_LIST) == 1) {\n-\t\tif (rte_kvargs_process(kvlist, IPN3KE_FPGA_ACCELERATION_LIST,\n-\t\t\t\t &rte_ifpga_get_string_arg,\n-\t\t\t\t &acc_name) < 0) {\n-\t\t\tIPN3KE_AFU_PMD_ERR(\"error to parse %s\",\n-\t\t\t\t IPN3KE_FPGA_ACCELERATION_LIST);\n-\t\t\tgoto end;\n-\t\t} else {\n-\t\t\tacc_list_en = 1;\n-\t\t}\n-\t}\n-\n-\tif (rte_kvargs_count(kvlist, IPN3KE_I40E_PF_LIST) == 1) {\n-\t\tif (rte_kvargs_process(kvlist, IPN3KE_I40E_PF_LIST,\n-\t\t\t\t &rte_ifpga_get_string_arg,\n-\t\t\t\t &pf_name) < 0) {\n-\t\t\tIPN3KE_AFU_PMD_ERR(\"error to parse %s\",\n-\t\t\t\t IPN3KE_I40E_PF_LIST);\n-\t\t\tgoto end;\n-\t\t} else {\n-\t\t\tpf_list_en = 1;\n-\t\t}\n-\t}\n-\n-\tif (!afu_name_en) {\n-\t\tIPN3KE_AFU_PMD_ERR(\"arg %s is mandatory for ipn3ke\",\n-\t\t\t IPN3KE_AFU_NAME);\n-\t\tgoto end;\n-\t}\n-\n-\tif (!pf_list_en) {\n-\t\tIPN3KE_AFU_PMD_ERR(\"arg %s is mandatory for ipn3ke\",\n-\t\t\t IPN3KE_I40E_PF_LIST);\n-\t\tgoto end;\n-\t}\n-\n-\tif (acc_list_en) {\n-\t\tret = ipn3ke_cfg_parse_acc_list(afu_name, acc_name);\n-\t\tif (ret) {\n-\t\t\tIPN3KE_AFU_PMD_ERR(\"arg %s parse error for ipn3ke\",\n-\t\t\t IPN3KE_FPGA_ACCELERATION_LIST);\n-\t\t\tgoto end;\n-\t\t}\n-\t} else {\n-\t\tIPN3KE_AFU_PMD_INFO(\"arg %s is optional for ipn3ke, using i40e acc\",\n-\t\t\t IPN3KE_FPGA_ACCELERATION_LIST);\n-\t}\n-\n-\tret = ipn3ke_cfg_parse_i40e_pf_ethdev(afu_name, pf_name);\n-\tif (ret)\n-\t\tgoto end;\n-end:\n-\tif (kvlist)\n-\t\trte_kvargs_free(kvlist);\n-\tif (afu_name)\n-\t\tfree(afu_name);\n-\tif (acc_name)\n-\t\tfree(acc_name);\n-\n-\treturn ret;\n-}\n-\n-static int\n-ipn3ke_cfg_remove(struct rte_vdev_device *dev)\n-{\n-\tstruct rte_devargs *devargs;\n-\tstruct rte_kvargs *kvlist = NULL;\n-\tchar *afu_name = NULL;\n-\tstruct rte_afu_device *afu_dev;\n-\tint ret = -1;\n-\n-\tdevargs = dev->device.devargs;\n-\n-\tkvlist = rte_kvargs_parse(devargs->args, valid_args);\n-\tif (!kvlist) {\n-\t\tIPN3KE_AFU_PMD_ERR(\"error when parsing param\");\n-\t\tgoto end;\n-\t}\n-\n-\tif (rte_kvargs_count(kvlist, IPN3KE_AFU_NAME) == 1) {\n-\t\tif (rte_kvargs_process(kvlist, IPN3KE_AFU_NAME,\n-\t\t\t\t &rte_ifpga_get_string_arg,\n-\t\t\t\t &afu_name) < 0) {\n-\t\t\tIPN3KE_AFU_PMD_ERR(\"error to parse %s\",\n-\t\t\t\t IPN3KE_AFU_NAME);\n-\t\t} else {\n-\t\t\tafu_dev = rte_ifpga_find_afu_by_name(afu_name);\n-\t\t\tif (!afu_dev)\n-\t\t\t\tgoto end;\n-\t\t\tret = ipn3ke_vswitch_remove(afu_dev);\n-\t\t}\n-\t} else {\n-\t\tIPN3KE_AFU_PMD_ERR(\"Remove ipn3ke_cfg %p error\", dev);\n-\t}\n-\n-end:\n-\tif (kvlist)\n-\t\trte_kvargs_free(kvlist);\n-\n-\treturn ret;\n-}\n-\n-static struct rte_vdev_driver ipn3ke_cfg_driver = {\n-\t.probe = ipn3ke_cfg_probe,\n-\t.remove = ipn3ke_cfg_remove,\n-};\n-\n-RTE_PMD_REGISTER_VDEV(ipn3ke_cfg, ipn3ke_cfg_driver);\n-RTE_PMD_REGISTER_PARAM_STRING(ipn3ke_cfg,\n-\t\"afu=<string> \"\n-\t\"fpga_acc=<string>\"\n-\t\"i40e_pf=<string>\");\n-\n RTE_INIT(ipn3ke_afu_init_log)\n {\n \tipn3ke_afu_logtype = rte_log_register(\"pmd.afu.ipn3ke\");\ndiff --git a/drivers/net/ipn3ke/ipn3ke_representor.c b/drivers/net/ipn3ke/ipn3ke_representor.c\nindex 8300cc3..a4ee460 100644\n--- a/drivers/net/ipn3ke/ipn3ke_representor.c\n+++ b/drivers/net/ipn3ke/ipn3ke_representor.c\n@@ -20,6 +20,7 @@\n #include <rte_rawdev_pmd.h>\n #include <rte_bus_ifpga.h>\n #include <ifpga_logs.h>\n+#include <rte_pmd_i40e.h>\n \n #include \"ipn3ke_rawdev_api.h\"\n #include \"ipn3ke_flow.h\"\n@@ -2906,8 +2907,10 @@ static uint16_t ipn3ke_rpst_recv_pkts(__rte_unused void *rx_q,\n \trpst->switch_domain_id = representor_param->switch_domain_id;\n \trpst->port_id = representor_param->port_id;\n \trpst->hw = representor_param->hw;\n-\trpst->i40e_pf_eth = NULL;\n-\trpst->i40e_pf_eth_port_id = 0xFFFF;\n+\trpst->i40e_pf_eth = representor_param->i40e_pf_eth;\n+\trpst->i40e_pf_eth_port_id = representor_param->i40e_pf_eth_port_id;\n+\tif (rpst->i40e_pf_eth)\n+\t\ti40e_set_switch_dev(rpst->i40e_pf_eth, rpst->ethdev);\n \n \tethdev->data->mac_addrs = rte_zmalloc(\"ipn3ke\", RTE_ETHER_ADDR_LEN, 0);\n \tif (!ethdev->data->mac_addrs) {\n", "prefixes": [ "12/12" ] }