Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1165381/?format=api
{ "id": 1165381, "url": "http://patchwork.ozlabs.org/api/patches/1165381/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190920091724.51767-9-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": "<20190920091724.51767-9-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-09-20T09:17:23", "name": "[next,S10,09/10] i40e: Fix LED blinking flow for X710T*L devices.", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1ca6b9cbf32ed7479c5e29b1c9e650b5a6e8c6e3", "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/20190920091724.51767-9-alice.michael@intel.com/mbox/", "series": [ { "id": 131821, "url": "http://patchwork.ozlabs.org/api/series/131821/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=131821", "date": "2019-09-20T09:17:15", "name": "[next,S10,01/10] i40e: Fix for persistent lldp support", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/131821/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1165381/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1165381/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 46Zgw24yyBz9sPG\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 21 Sep 2019 03:40:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DF59888042;\n\tFri, 20 Sep 2019 17:39:59 +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 6qR-TzdMf7mg; Fri, 20 Sep 2019 17:39:58 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DC74987C0C;\n\tFri, 20 Sep 2019 17:39:57 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 101C71BF2C6\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0D1BC85764\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:54 +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 JJxqU89nIsgb for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:53 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 74778857B0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 20 Sep 2019 17:39:53 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t20 Sep 2019 10:39:52 -0700", "from alicemic-1.jf.intel.com ([10.166.17.62])\n\tby fmsmga004.fm.intel.com with ESMTP; 20 Sep 2019 10:39:52 -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,529,1559545200\"; d=\"scan'208\";a=\"212635344\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 20 Sep 2019 02:17:23 -0700", "Message-Id": "<20190920091724.51767-9-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190920091724.51767-1-alice.michael@intel.com>", "References": "<20190920091724.51767-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S10 09/10] i40e: Fix LED blinking\n\tflow for X710T*L devices.", "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": "Damian Milosek <damian.milosek@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: Damian Milosek <damian.milosek@intel.com>\n\nAdd X710T*L device specific operations (in port LED detection and\nhandling\nof GLGEN_GPIO_CTL.PIN_FUNC field) to enable LED blinking.\n\nSigned-off-by: Damian Milosek <damian.milosek@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_common.c | 29 +++++++++++++++++--\n drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 ++\n 2 files changed, 28 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex ed8608b874f4..8b25a6d9c81d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -1437,9 +1437,9 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)\n \tu32 gpio_val = 0;\n \tu32 port;\n \n-\tif (!hw->func_caps.led[idx])\n+\tif (!I40E_IS_X710TL_DEVICE(hw->device_id) &&\n+\t !hw->func_caps.led[idx])\n \t\treturn 0;\n-\n \tgpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx));\n \tport = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >>\n \t\tI40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT;\n@@ -1458,8 +1458,15 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx)\n #define I40E_FILTER_ACTIVITY 0xE\n #define I40E_LINK_ACTIVITY 0xC\n #define I40E_MAC_ACTIVITY 0xD\n+#define I40E_FW_LED BIT(4)\n+#define I40E_LED_MODE_VALID (I40E_GLGEN_GPIO_CTL_LED_MODE_MASK >> \\\n+\t\t\t I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)\n+\n #define I40E_LED0 22\n \n+#define I40E_PIN_FUNC_SDP 0x0\n+#define I40E_PIN_FUNC_LED 0x1\n+\n /**\n * i40e_led_get - return current on/off mode\n * @hw: pointer to the hw struct\n@@ -1504,8 +1511,10 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)\n {\n \tint i;\n \n-\tif (mode & 0xfffffff0)\n+\tif (mode & ~I40E_LED_MODE_VALID) {\n \t\thw_dbg(hw, \"invalid mode passed in %X\\n\", mode);\n+\t\treturn;\n+\t}\n \n \t/* as per the documentation GPIO 22-29 are the LED\n \t * GPIO pins named LED0..LED7\n@@ -1515,6 +1524,20 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)\n \n \t\tif (!gpio_val)\n \t\t\tcontinue;\n+\n+\t\tif (I40E_IS_X710TL_DEVICE(hw->device_id)) {\n+\t\t\tu32 pin_func = 0;\n+\n+\t\t\tif (mode & I40E_FW_LED)\n+\t\t\t\tpin_func = I40E_PIN_FUNC_SDP;\n+\t\t\telse\n+\t\t\t\tpin_func = I40E_PIN_FUNC_LED;\n+\n+\t\t\tgpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK;\n+\t\t\tgpio_val |= ((pin_func <<\n+\t\t\t\t I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) &\n+\t\t\t\t I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK);\n+\t\t}\n \t\tgpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK;\n \t\t/* this & is a bit of paranoia, but serves as a range check */\n \t\tgpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h\nindex bac4da031f9b..bf15a868292f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h\n@@ -23,6 +23,8 @@\n #define I40E_DEV_ID_10G_BASE_T_BC\t0x15FF\n #define I40E_DEV_ID_10G_B\t\t0x104F\n #define I40E_DEV_ID_10G_SFP\t\t0x104E\n+#define I40E_IS_X710TL_DEVICE(d) \\\n+\t((d) == I40E_DEV_ID_10G_BASE_T_BC)\n #define I40E_DEV_ID_KX_X722\t\t0x37CE\n #define I40E_DEV_ID_QSFP_X722\t\t0x37CF\n #define I40E_DEV_ID_SFP_X722\t\t0x37D0\n", "prefixes": [ "next", "S10", "09/10" ] }