Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1037796/?format=api
{ "id": 1037796, "url": "http://patchwork.ozlabs.org/api/patches/1037796/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190206230826.24970-6-alice.michael@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20190206230826.24970-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-02-06T23:08:20", "name": "[next,S2-V2,06/12] i40e: Update i40e_init_dcb to return correct error", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "79cc9372015511b4356fad02951a72c01e38551d", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190206230826.24970-6-alice.michael@intel.com/mbox/", "series": [ { "id": 90473, "url": "http://patchwork.ozlabs.org/api/series/90473/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=90473", "date": "2019-02-06T23:08:19", "name": "[next,S2-V2,01/12] i40e: Queues are reserved despite \"Invalid argument\" error.", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/90473/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1037796/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1037796/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43vxwp4sLxz9s4Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 7 Feb 2019 10:09:46 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0D244885BA;\n\tWed, 6 Feb 2019 23:09:45 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id lT-SJx4Wl0z7; Wed, 6 Feb 2019 23:09:42 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A2B1C8868C;\n\tWed, 6 Feb 2019 23:09:34 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D0A171BF968\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Feb 2019 23:09:20 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 9297986196\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Feb 2019 23:09:20 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id k4LvkUwsIO3T for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Feb 2019 23:09:18 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 120C0860A2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Feb 2019 23:09:18 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Feb 2019 15:09:18 -0800", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga002.fm.intel.com with ESMTP; 06 Feb 2019 15:09:17 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.58,342,1544515200\"; d=\"scan'208\";a=\"141300918\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 6 Feb 2019 15:08:20 -0800", "Message-Id": "<20190206230826.24970-6-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190206230826.24970-1-alice.michael@intel.com>", "References": "<20190206230826.24970-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S2-V2 06/12] i40e: Update\n\ti40e_init_dcb to return correct error", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Chinh T Cao <chinh.t.cao@intel.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Chinh T Cao <chinh.t.cao@intel.com>\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>\n---\n drivers/net/ethernet/intel/i40e/i40e_dcb.c | 28 ++++++++-------------\n drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +-\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-\n 3 files changed, 13 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\nindex 56bff8faf371..292eeb3def10 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n@@ -863,22 +863,23 @@ i40e_status 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-i40e_status i40e_init_dcb(struct i40e_hw *hw)\n+i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change)\n {\n \ti40e_status ret = 0;\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 @@ i40e_status 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 @@ i40e_status 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/ethernet/intel/i40e/i40e_dcb.h b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\nindex 2b748a60a843..ddb48ae7cce4 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n@@ -124,5 +124,5 @@ i40e_status 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 i40e_status i40e_get_dcb_config(struct i40e_hw *hw);\n-i40e_status i40e_init_dcb(struct i40e_hw *hw);\n+i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change);\n #endif /* _I40E_DCB_H_ */\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 37f875f759d0..e842b143f7b4 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -6393,7 +6393,7 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)\n \t\tgoto out;\n \n \t/* Get the initial DCB configuration */\n-\terr = i40e_init_dcb(hw);\n+\terr = i40e_init_dcb(hw, true);\n \tif (!err) {\n \t\t/* Device/Function is not DCBX capable */\n \t\tif ((!hw->func_caps.dcb) ||\n", "prefixes": [ "next", "S2-V2", "06/12" ] }