Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/64468/?format=api
{ "id": 64468, "url": "http://patches.dpdk.org/api/patches/64468/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200113023949.26718-5-xiaolong.ye@intel.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": "<20200113023949.26718-5-xiaolong.ye@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200113023949.26718-5-xiaolong.ye@intel.com", "date": "2020-01-13T02:39:16", "name": "[v4,04/36] net/i40e/base: decouple cfg_lldp_mib_change from init_dcb", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e468860ed761e7f3523e34c5bef4ef9191bc35da", "submitter": { "id": 1120, "url": "http://patches.dpdk.org/api/people/1120/?format=api", "name": "Xiaolong Ye", "email": "xiaolong.ye@intel.com" }, "delegate": { "id": 31221, "url": "http://patches.dpdk.org/api/users/31221/?format=api", "username": "yexl", "first_name": "xiaolong", "last_name": "ye", "email": "xiaolong.ye@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200113023949.26718-5-xiaolong.ye@intel.com/mbox/", "series": [ { "id": 8064, "url": "http://patches.dpdk.org/api/series/8064/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8064", "date": "2020-01-13T02:39:12", "name": "update for i40e base code", "version": 4, "mbox": "http://patches.dpdk.org/series/8064/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/64468/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/64468/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 4577AA04F0;\n\tMon, 13 Jan 2020 03:47:43 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B39AE1D59A;\n\tMon, 13 Jan 2020 03:47:12 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by dpdk.org (Postfix) with ESMTP id 30DF21D57E\n for <dev@dpdk.org>; Mon, 13 Jan 2020 03:47:07 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 12 Jan 2020 18:47:06 -0800", "from dpdk_yexl_af_xdp.sh.intel.com ([10.67.119.206])\n by FMSMGA003.fm.intel.com with ESMTP; 12 Jan 2020 18:47:05 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.69,427,1571727600\"; d=\"scan'208\";a=\"272916312\"", "From": "Xiaolong Ye <xiaolong.ye@intel.com>", "To": "Beilei Xing <beilei.xing@intel.com>,\n\tQi Zhang <qi.z.zhang@intel.com>", "Cc": "dev@dpdk.org, Xiaolong Ye <xiaolong.ye@intel.com>,\n Chinh T Cao <chinh.t.cao@intel.com>", "Date": "Mon, 13 Jan 2020 10:39:16 +0800", "Message-Id": "<20200113023949.26718-5-xiaolong.ye@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200113023949.26718-1-xiaolong.ye@intel.com>", "References": "<20191202074935.97629-1-xiaolong.ye@intel.com>\n <20200113023949.26718-1-xiaolong.ye@intel.com>", "Subject": "[dpdk-dev] [PATCH v4 04/36] net/i40e/base: decouple\n\tcfg_lldp_mib_change from init_dcb", "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": "There is a need to enable MIB change event, not at the same time as\ninit_dcb. This patch will serve this requirement.\n\nModify the i40e_init_dcb to return the correct error when LLDP or DCBX\nis not in operational state.\n\nSigned-off-by: Chinh T Cao <chinh.t.cao@intel.com>\nSigned-off-by: Xiaolong Ye <xiaolong.ye@intel.com>\n---\n drivers/net/i40e/base/i40e_dcb.c | 28 +++++++++++-----------------\n drivers/net/i40e/base/i40e_dcb.h | 3 ++-\n drivers/net/i40e/i40e_ethdev.c | 4 ++--\n 3 files changed, 15 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/i40e/base/i40e_dcb.c b/drivers/net/i40e/base/i40e_dcb.c\nindex a26f82b3a..7cc8c83dc 100644\n--- a/drivers/net/i40e/base/i40e_dcb.c\n+++ b/drivers/net/i40e/base/i40e_dcb.c\n@@ -863,22 +863,23 @@ enum i40e_status_code i40e_get_dcb_config(struct i40e_hw *hw)\n /**\n * i40e_init_dcb\n * @hw: pointer to the hw struct\n+ * @enable_mib_change: enable mib change event\n *\n * Update DCB configuration from the Firmware\n **/\n-enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)\n+enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change)\n {\n \tenum i40e_status_code ret = I40E_SUCCESS;\n \tstruct i40e_lldp_variables lldp_cfg;\n \tu8 adminstatus = 0;\n \n \tif (!hw->func_caps.dcb)\n-\t\treturn ret;\n+\t\treturn I40E_NOT_SUPPORTED;\n \n \t/* Read LLDP NVM area */\n \tret = i40e_read_lldp_cfg(hw, &lldp_cfg);\n \tif (ret)\n-\t\treturn ret;\n+\t\treturn I40E_ERR_NOT_READY;\n \n \t/* Get the LLDP AdminStatus for the current port */\n \tadminstatus = lldp_cfg.adminstatus >> (hw->port * 4);\n@@ -887,7 +888,7 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)\n \t/* LLDP agent disabled */\n \tif (!adminstatus) {\n \t\thw->dcbx_status = I40E_DCBX_STATUS_DISABLED;\n-\t\treturn ret;\n+\t\treturn I40E_ERR_NOT_READY;\n \t}\n \n \t/* Get DCBX status */\n@@ -896,26 +897,19 @@ enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw)\n \t\treturn ret;\n \n \t/* Check the DCBX Status */\n-\tswitch (hw->dcbx_status) {\n-\tcase I40E_DCBX_STATUS_DONE:\n-\tcase I40E_DCBX_STATUS_IN_PROGRESS:\n+\tif (hw->dcbx_status == I40E_DCBX_STATUS_DONE ||\n+\t hw->dcbx_status == I40E_DCBX_STATUS_IN_PROGRESS) {\n \t\t/* Get current DCBX configuration */\n \t\tret = i40e_get_dcb_config(hw);\n \t\tif (ret)\n \t\t\treturn ret;\n-\t\tbreak;\n-\tcase I40E_DCBX_STATUS_DISABLED:\n-\t\treturn ret;\n-\tcase I40E_DCBX_STATUS_NOT_STARTED:\n-\tcase I40E_DCBX_STATUS_MULTIPLE_PEERS:\n-\tdefault:\n-\t\tbreak;\n+\t} else if (hw->dcbx_status == I40E_DCBX_STATUS_DISABLED) {\n+\t\treturn I40E_ERR_NOT_READY;\n \t}\n \n \t/* Configure the LLDP MIB change event */\n-\tret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);\n-\tif (ret)\n-\t\treturn ret;\n+\tif (enable_mib_change)\n+\t\tret = i40e_aq_cfg_lldp_mib_change_event(hw, true, NULL);\n \n \treturn ret;\n }\ndiff --git a/drivers/net/i40e/base/i40e_dcb.h b/drivers/net/i40e/base/i40e_dcb.h\nindex 85b0eed3a..253943308 100644\n--- a/drivers/net/i40e/base/i40e_dcb.h\n+++ b/drivers/net/i40e/base/i40e_dcb.h\n@@ -186,7 +186,8 @@ enum i40e_status_code i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type,\n \t\t\t\t\t u8 bridgetype,\n \t\t\t\t\t struct i40e_dcbx_config *dcbcfg);\n enum i40e_status_code i40e_get_dcb_config(struct i40e_hw *hw);\n-enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw);\n+enum i40e_status_code i40e_init_dcb(struct i40e_hw *hw,\n+\t\t\t\t bool enable_mib_change);\n enum i40e_status_code i40e_set_dcb_config(struct i40e_hw *hw);\n enum i40e_status_code i40e_dcb_config_to_lldp(u8 *lldpmib, u16 *miblen,\n \t\t\t\t\t struct i40e_dcbx_config *dcbcfg);\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex 86fc4f407..d63658796 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -11579,7 +11579,7 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb)\n \t\t\t\tPMD_INIT_LOG(DEBUG, \"Failed to stop lldp\");\n \t\t}\n \n-\t\tret = i40e_init_dcb(hw);\n+\t\tret = i40e_init_dcb(hw, true);\n \t\t/* If lldp agent is stopped, the return value from\n \t\t * i40e_init_dcb we expect is failure with I40E_AQ_RC_EPERM\n \t\t * adminq status. Otherwise, it should return success.\n@@ -11627,7 +11627,7 @@ i40e_dcb_init_configure(struct rte_eth_dev *dev, bool sw_dcb)\n \t\tif (ret != I40E_SUCCESS)\n \t\t\tPMD_INIT_LOG(DEBUG, \"Failed to start lldp\");\n \n-\t\tret = i40e_init_dcb(hw);\n+\t\tret = i40e_init_dcb(hw, true);\n \t\tif (!ret) {\n \t\t\tif (hw->dcbx_status == I40E_DCBX_STATUS_DISABLED) {\n \t\t\t\tPMD_INIT_LOG(ERR,\n", "prefixes": [ "v4", "04/36" ] }