Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1135855/?format=api
{ "id": 1135855, "url": "http://patchwork.ozlabs.org/api/patches/1135855/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190723092759.3614-2-anthony.l.nguyen@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": "<20190723092759.3614-2-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-07-23T09:27:49", "name": "[S24,02/12] ice: Account for all states of FW DCBx and LLDP", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "73955d4cdae91a14488bcade01edfa54040cc9ed", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20190723092759.3614-2-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 121041, "url": "http://patchwork.ozlabs.org/api/series/121041/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121041", "date": "2019-07-23T09:27:51", "name": "[S24,01/12] ice: Allow egress control packets from PF_VSI", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121041/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1135855/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1135855/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 45tR4C34mFz9s7T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 24 Jul 2019 03:56:27 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id AB5242045F;\n\tTue, 23 Jul 2019 17:56:25 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id gbXJ2+jwQr8x; Tue, 23 Jul 2019 17:56:21 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id A36BF20499;\n\tTue, 23 Jul 2019 17:56:20 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 4216B1BF95A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:17 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3F6A584CE1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:17 +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 AJvASqR9XJn1 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:15 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 51F9681E24\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 17:56:15 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jul 2019 10:56:14 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga002.jf.intel.com with ESMTP; 23 Jul 2019 10:56:13 -0700" ], "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.64,299,1559545200\"; d=\"scan'208\";a=\"180816342\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 23 Jul 2019 02:27:49 -0700", "Message-Id": "<20190723092759.3614-2-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190723092759.3614-1-anthony.l.nguyen@intel.com>", "References": "<20190723092759.3614-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S24 02/12] ice: Account for all states of\n\tFW DCBx and LLDP", "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>", "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: Dave Ertman <david.m.ertman@intel.com>\n\nCurrently, only the DCBx status is taken into account to\ndetermine if FW LLDP is possible. But there are NVM version\ncoming out with DCBx enabled, and FW LLDP disabled. This\nis causing errors where the driver sees that DCBx is not\ndisabled, and then tries to register for LLDP MIB change\nevents, and fails.\n\nChange the logic to detect both DCBx and LLDP states in the\nFW engine.\n\nSigned-off-by: Dave Ertman <david.m.ertman@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 34 +++++++-------------\n 1 file changed, 12 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex d285aba3fea7..9ab9ec1ce19e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -324,6 +324,11 @@ void ice_dcb_rebuild(struct ice_pf *pf)\n \t}\n \n \tice_init_dcb(&pf->hw);\n+\tif (pf->hw.port_info->dcbx_status == ICE_DCBX_STATUS_DIS)\n+\t\tpf->hw.port_info->is_sw_lldp = true;\n+\telse\n+\t\tpf->hw.port_info->is_sw_lldp = false;\n+\n \tif (ice_dcb_need_recfg(pf, prev_cfg, local_dcbx_cfg)) {\n \t\t/* difference in cfg detected - disable DCB till next MIB */\n \t\tdev_err(&pf->pdev->dev, \"Set local MIB not accurate\\n\");\n@@ -445,35 +450,17 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \tstruct device *dev = &pf->pdev->dev;\n \tstruct ice_port_info *port_info;\n \tstruct ice_hw *hw = &pf->hw;\n-\tint sw_default = 0;\n \tint err;\n \n \tport_info = hw->port_info;\n \n \terr = ice_init_dcb(hw);\n \tif (err) {\n-\t\t/* FW LLDP is not active, default to SW DCBX/LLDP */\n-\t\tdev_info(&pf->pdev->dev, \"FW LLDP is not active\\n\");\n-\t\thw->port_info->dcbx_status = ICE_DCBX_STATUS_NOT_STARTED;\n-\t\thw->port_info->is_sw_lldp = true;\n-\t}\n-\n-\tif (port_info->dcbx_status == ICE_DCBX_STATUS_DIS)\n-\t\tdev_info(&pf->pdev->dev, \"DCBX disabled\\n\");\n-\n-\t/* LLDP disabled in FW */\n-\tif (port_info->is_sw_lldp) {\n-\t\tsw_default = 1;\n-\t\tdev_info(&pf->pdev->dev, \"DCBx/LLDP in SW mode.\\n\");\n+\t\t/* FW LLDP is disabled, activate SW DCBX/LLDP mode */\n+\t\tdev_info(&pf->pdev->dev,\n+\t\t\t \"FW LLDP is disabled, DCBx/LLDP in SW mode.\\n\");\n+\t\tport_info->is_sw_lldp = true;\n \t\tclear_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags);\n-\t} else {\n-\t\tset_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags);\n-\t}\n-\n-\tif (port_info->dcbx_status == ICE_DCBX_STATUS_NOT_STARTED)\n-\t\tdev_info(&pf->pdev->dev, \"DCBX not started\\n\");\n-\n-\tif (sw_default) {\n \t\terr = ice_dcb_sw_dflt_cfg(pf, locked);\n \t\tif (err) {\n \t\t\tdev_err(&pf->pdev->dev,\n@@ -488,6 +475,9 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\treturn 0;\n \t}\n \n+\tport_info->is_sw_lldp = false;\n+\tset_bit(ICE_FLAG_ENABLE_FW_LLDP, pf->flags);\n+\n \t/* DCBX in FW and LLDP enabled in FW */\n \tpf->dcbx_cap = DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_IEEE;\n \n", "prefixes": [ "S24", "02/12" ] }