Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1219431/?format=api
{ "id": 1219431, "url": "http://patchwork.ozlabs.org/api/patches/1219431/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200108081924.20008-1-sasha.neftin@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": "<20200108081924.20008-1-sasha.neftin@intel.com>", "list_archive_url": null, "date": "2020-01-08T08:19:24", "name": "[v3] igc: Add PHY power management control", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5fcd3a7168a4ab910239f344d5ccbe4a8832f8e1", "submitter": { "id": 69860, "url": "http://patchwork.ozlabs.org/api/people/69860/?format=api", "name": "Sasha Neftin", "email": "sasha.neftin@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/20200108081924.20008-1-sasha.neftin@intel.com/mbox/", "series": [ { "id": 151825, "url": "http://patchwork.ozlabs.org/api/series/151825/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=151825", "date": "2020-01-08T08:19:24", "name": "[v3] igc: Add PHY power management control", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/151825/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1219431/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1219431/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.133;\n\thelo=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 47t2Gb3kwPz9sRf\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 8 Jan 2020 19:19:33 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id B6FDA879CD;\n\tWed, 8 Jan 2020 08:19:30 +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 n0jrdB0gFmPS; Wed, 8 Jan 2020 08:19:29 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1C4CF879A7;\n\tWed, 8 Jan 2020 08:19:29 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id BAF291BF2FA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 8 Jan 2020 08:19:27 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B7265841E9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 8 Jan 2020 08:19:27 +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 xUUlghN_AQaY for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 8 Jan 2020 08:19:27 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 27694844A8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 8 Jan 2020 08:19:27 +0000 (UTC)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Jan 2020 00:19:26 -0800", "from ccdlinuxdev08.iil.intel.com ([143.185.161.150])\n\tby fmsmga006.fm.intel.com with ESMTP; 08 Jan 2020 00:19:25 -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.69,409,1571727600\"; d=\"scan'208\";a=\"422849882\"", "From": "Sasha Neftin <sasha.neftin@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 8 Jan 2020 10:19:24 +0200", "Message-Id": "<20200108081924.20008-1-sasha.neftin@intel.com>", "X-Mailer": "git-send-email 2.11.0", "Subject": "[Intel-wired-lan] [PATCH v3] igc: Add PHY power management control", "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>", "MIME-Version": "1.0", "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": "PHY power management control should provide a reliable and accurate\nindication of PHY reset completion and decrease the delay time\nafter a PHY reset\n\nv1 -> v2: add hw_dbg print for a timeout\nv2 -> v3: address some community comments\n\nSigned-off-by: Sasha Neftin <sasha.neftin@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_defines.h | 1 +\n drivers/net/ethernet/intel/igc/igc_phy.c | 16 +++++++++++++++-\n drivers/net/ethernet/intel/igc/igc_regs.h | 1 +\n 3 files changed, 17 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h\nindex 9e34b0969322..58efa7a02c68 100644\n--- a/drivers/net/ethernet/intel/igc/igc_defines.h\n+++ b/drivers/net/ethernet/intel/igc/igc_defines.h\n@@ -464,6 +464,7 @@\n /* PHY Status Register */\n #define MII_SR_LINK_STATUS\t0x0004 /* Link Status 1 = link */\n #define MII_SR_AUTONEG_COMPLETE\t0x0020 /* Auto Neg Complete */\n+#define IGC_PHY_RST_COMP\t0x0100 /* Internal PHY reset completion */\n \n /* PHY 1000 MII Register/Bit Definitions */\n /* PHY Registers defined by IEEE */\ndiff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c\nindex f4b05af0dd2f..8e1799508edc 100644\n--- a/drivers/net/ethernet/intel/igc/igc_phy.c\n+++ b/drivers/net/ethernet/intel/igc/igc_phy.c\n@@ -173,6 +173,7 @@ s32 igc_check_downshift(struct igc_hw *hw)\n s32 igc_phy_hw_reset(struct igc_hw *hw)\n {\n \tstruct igc_phy_info *phy = &hw->phy;\n+\tu32 phpm = 0, timeout = 10000;\n \ts32 ret_val;\n \tu32 ctrl;\n \n@@ -186,6 +187,8 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)\n \tif (ret_val)\n \t\tgoto out;\n \n+\tphpm = rd32(IGC_I225_PHPM);\n+\n \tctrl = rd32(IGC_CTRL);\n \twr32(IGC_CTRL, ctrl | IGC_CTRL_PHY_RST);\n \twrfl();\n@@ -195,7 +198,18 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)\n \twr32(IGC_CTRL, ctrl);\n \twrfl();\n \n-\tusleep_range(1500, 2000);\n+\t/* SW should guarantee 100us for the completion of the PHY reset */\n+\tusleep_range(100, 150);\n+\tdo {\n+\t\tphpm = rd32(IGC_I225_PHPM);\n+\t\ttimeout--;\n+\t\tudelay(1);\n+\t} while (!(phpm & IGC_PHY_RST_COMP) && timeout);\n+\n+\tif (!timeout)\n+\t\thw_dbg(\"Timeout is expired after a phy reset\\n\");\n+\n+\tusleep_range(100, 150);\n \n \tphy->ops.release(hw);\n \ndiff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h\nindex c82111051898..164c42b39dfa 100644\n--- a/drivers/net/ethernet/intel/igc/igc_regs.h\n+++ b/drivers/net/ethernet/intel/igc/igc_regs.h\n@@ -12,6 +12,7 @@\n #define IGC_MDIC\t\t0x00020 /* MDI Control - RW */\n #define IGC_MDICNFG\t\t0x00E04 /* MDC/MDIO Configuration - RW */\n #define IGC_CONNSW\t\t0x00034 /* Copper/Fiber switch control - RW */\n+#define IGC_I225_PHPM\t\t0x00E14\t /* I225 PHY Power Management */\n \n /* Internal Packet Buffer Size Registers */\n #define IGC_RXPBS\t\t0x02404 /* Rx Packet Buffer Size - RW */\n", "prefixes": [ "v3" ] }