Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1135858/?format=api
{ "id": 1135858, "url": "http://patchwork.ozlabs.org/api/patches/1135858/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190723100144.57435-3-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": "<20190723100144.57435-3-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-07-23T10:01:35", "name": "[next,S8,03/12] i40e: check_recovery_mode had wrong if statement", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d7b3ef642b4f9052670e0ffc5d8e6579f3d79b5b", "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/20190723100144.57435-3-alice.michael@intel.com/mbox/", "series": [ { "id": 121043, "url": "http://patchwork.ozlabs.org/api/series/121043/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121043", "date": "2019-07-23T10:01:38", "name": "[next,S8,01/12] i40e: fix shifts of signed values", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121043/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1135858/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1135858/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 45tRfY0qh8z9s00\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 24 Jul 2019 04:22:45 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AA04E86981;\n\tTue, 23 Jul 2019 18:22:43 +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 Ci21t9ANt3Gx; Tue, 23 Jul 2019 18:22:42 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 4EA73866B3;\n\tTue, 23 Jul 2019 18:22:42 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id DE26B1BF2A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DB3AD857E2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Rav9oElEaZl2 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 473AB85AE9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jul 2019 11:22:37 -0700", "from alicemic-1.jf.intel.com ([10.166.17.62])\n\tby orsmga003.jf.intel.com with ESMTP; 23 Jul 2019 11:22:35 -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=\"172037671\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 23 Jul 2019 06:01:35 -0400", "Message-Id": "<20190723100144.57435-3-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190723100144.57435-1-alice.michael@intel.com>", "References": "<20190723100144.57435-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S8 03/12] i40e: check_recovery_mode\n\thad wrong if statement", "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": "Adrian Podlawski <adrian.podlawski@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: Adrian Podlawski <adrian.podlawski@intel.com>\n\nFunction check_recovery_mode had wrong if statement.\nNow we check proper FWS1B register values, which are responsible for\nthe recovery mode. Recovery mode has 4 values for FVL and 2 for FPK.\nThat's why we need 6 different flags which are defined in shared code.\nNow in if statement we recognize type of mac address\nand register value.\nWithout those changes driver could show wrong state.\n\nSigned-off-by: Adrian Podlawski <adrian.podlawski@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 17 ++++++++++++++---\n drivers/net/ethernet/intel/i40e/i40e_register.h | 6 ++++++\n 2 files changed, 20 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex b807dd6b1417..4551d97771c9 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -14578,9 +14578,20 @@ void i40e_set_fec_in_flags(u8 fec_cfg, u32 *flags)\n **/\n static bool i40e_check_recovery_mode(struct i40e_pf *pf)\n {\n-\tu32 val = rd32(&pf->hw, I40E_GL_FWSTS);\n-\n-\tif (val & I40E_GL_FWSTS_FWS1B_MASK) {\n+\tu32 val = rd32(&pf->hw, I40E_GL_FWSTS) & I40E_GL_FWSTS_FWS1B_MASK;\n+\tbool is_recovery_mode = false;\n+\n+\tif (pf->hw.mac.type == I40E_MAC_XL710)\n+\t\tis_recovery_mode =\n+\t\tval == I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK ||\n+\t\tval == I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK ||\n+\t\tval == I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_TRANSITION_MASK ||\n+\t\tval == I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_NVM_MASK;\n+\tif (pf->hw.mac.type == I40E_MAC_X722)\n+\t\tis_recovery_mode =\n+\t\tval == I40E_X722_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK ||\n+\t\tval == I40E_X722_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK;\n+\tif (is_recovery_mode) {\n \t\tdev_notice(&pf->pdev->dev, \"Firmware recovery mode detected. Limiting functionality.\\n\");\n \t\tdev_notice(&pf->pdev->dev, \"Refer to the Intel(R) Ethernet Adapters and Devices User Guide for details on firmware recovery mode.\\n\");\n \t\tset_bit(__I40E_RECOVERY_MODE, pf->state);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h\nindex 330ac19a5dae..d35d690ca10f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_register.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_register.h\n@@ -363,6 +363,12 @@\n #define I40E_GL_FWSTS_FWRI_MASK I40E_MASK(0x1, I40E_GL_FWSTS_FWRI_SHIFT)\n #define I40E_GL_FWSTS_FWS1B_SHIFT 16\n #define I40E_GL_FWSTS_FWS1B_MASK I40E_MASK(0xFF, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK I40E_MASK(0x30, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK I40E_MASK(0x31, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_TRANSITION_MASK I40E_MASK(0x32, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_NVM_MASK I40E_MASK(0x33, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_X722_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK I40E_MASK(0xB, I40E_GL_FWSTS_FWS1B_SHIFT)\n+#define I40E_X722_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK I40E_MASK(0xC, I40E_GL_FWSTS_FWS1B_SHIFT)\n #define I40E_GLGEN_CLKSTAT 0x000B8184 /* Reset: POR */\n #define I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT 0\n #define I40E_GLGEN_CLKSTAT_CLKMODE_MASK I40E_MASK(0x1, I40E_GLGEN_CLKSTAT_CLKMODE_SHIFT)\n", "prefixes": [ "next", "S8", "03/12" ] }