Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1157166/?format=api
{ "id": 1157166, "url": "http://patchwork.ozlabs.org/api/patches/1157166/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190903083108.19593-3-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": "<20190903083108.19593-3-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-09-03T08:31:02", "name": "[S28,v2,3/9] ice: Check for DCB capability before initializing DCB", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "babab4d5fea4aa512a69fc690f4127b451dfdcc8", "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/20190903083108.19593-3-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 128806, "url": "http://patchwork.ozlabs.org/api/series/128806/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=128806", "date": "2019-09-03T08:31:06", "name": "[S28,v2,1/9] ice: Reliably reset VFs", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/128806/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1157166/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1157166/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 46NCrD4dRKz9sDB\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 4 Sep 2019 03:00:28 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 007B287E76;\n\tTue, 3 Sep 2019 17:00:27 +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 gmxzmJVRRvsb; Tue, 3 Sep 2019 17:00:25 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B018687E90;\n\tTue, 3 Sep 2019 17:00:22 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id E6CE31BF27F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Sep 2019 17:00:18 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id E4A672286F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Sep 2019 17:00:18 +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 WvoiPLjT426j for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Sep 2019 17:00:16 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E99562270C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 3 Sep 2019 17:00:15 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Sep 2019 10:00:13 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga006.jf.intel.com with ESMTP; 03 Sep 2019 10:00: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,463,1559545200\"; d=\"scan'208\";a=\"187320659\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 3 Sep 2019 01:31:02 -0700", "Message-Id": "<20190903083108.19593-3-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190903083108.19593-1-anthony.l.nguyen@intel.com>", "References": "<20190903083108.19593-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S28 v2 3/9] ice: Check for DCB capability\n\tbefore initializing DCB", "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: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\nCheck the ICE_FLAG_DCB_CAPABLE before calling ice_init_pf_dcb.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 3 ---\n drivers/net/ethernet/intel/ice/ice_main.c | 15 ++++++++-------\n 2 files changed, 8 insertions(+), 10 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 e922adf1fa15..20f440a64650 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -474,7 +474,6 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\t}\n \n \t\tpf->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;\n-\t\tset_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);\n \t\treturn 0;\n \t}\n \n@@ -483,8 +482,6 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\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-\tset_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);\n-\n \terr = ice_dcb_init_cfg(pf, locked);\n \tif (err)\n \t\tgoto dcb_init_err;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 703fc7bf2b31..8bb3b81876a9 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -2252,6 +2252,8 @@ static void ice_deinit_pf(struct ice_pf *pf)\n static int ice_init_pf(struct ice_pf *pf)\n {\n \tbitmap_zero(pf->flags, ICE_PF_FLAGS_NBITS);\n+\tif (pf->hw.func_caps.common_cap.dcb)\n+\t\tset_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);\n #ifdef CONFIG_PCI_IOV\n \tif (pf->hw.func_caps.common_cap.sr_iov_1_1) {\n \t\tstruct ice_hw *hw = &pf->hw;\n@@ -2529,13 +2531,12 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t\tgoto err_init_pf_unroll;\n \t}\n \n-\terr = ice_init_pf_dcb(pf, false);\n-\tif (err) {\n-\t\tclear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);\n-\t\tclear_bit(ICE_FLAG_DCB_ENA, pf->flags);\n-\n-\t\t/* do not fail overall init if DCB init fails */\n-\t\terr = 0;\n+\tif (test_bit(ICE_FLAG_DCB_CAPABLE, pf->flags)) {\n+\t\t/* Note: DCB init failure is non-fatal to load */\n+\t\tif (ice_init_pf_dcb(pf, false)) {\n+\t\t\tclear_bit(ICE_FLAG_DCB_CAPABLE, pf->flags);\n+\t\t\tclear_bit(ICE_FLAG_DCB_ENA, pf->flags);\n+\t\t}\n \t}\n \n \tice_determine_q_usage(pf);\n", "prefixes": [ "S28", "v2", "3/9" ] }