Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/738293/?format=api
{ "id": 738293, "url": "http://patchwork.ozlabs.org/api/patches/738293/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1489398476-15893-1-git-send-email-paul.greenwalt@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": "<1489398476-15893-1-git-send-email-paul.greenwalt@intel.com>", "list_archive_url": null, "date": "2017-03-13T09:47:56", "name": "ixgbe: Acquire PHY semaphore before device reset", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "bba796150739653df5ef781fc3b806ce5d4059ae", "submitter": { "id": 71166, "url": "http://patchwork.ozlabs.org/api/people/71166/?format=api", "name": "Paul Greenwalt", "email": "paul.greenwalt@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/1489398476-15893-1-git-send-email-paul.greenwalt@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/738293/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/738293/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3vhkZX6PlWz9s0m\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 14 Mar 2017 03:57:56 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2B37D89554;\n\tMon, 13 Mar 2017 16:57: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 eqNjEJ1i8cMw; Mon, 13 Mar 2017 16:57:53 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8424C88375;\n\tMon, 13 Mar 2017 16:57:53 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id B47021BFDB4\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 13 Mar 2017 16:57:52 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id AB400891EA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 13 Mar 2017 16:57:52 +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 yp07jhFCOpdb for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 13 Mar 2017 16:57:52 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id F19AF891CD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 13 Mar 2017 16:57:51 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga104.jf.intel.com with ESMTP; 13 Mar 2017 09:57:49 -0700", "from jfdmzpr05.jf.intel.com (HELO localhost.jf.intel.com)\n\t([10.7.210.24])\n\tby orsmga002.jf.intel.com with ESMTP; 13 Mar 2017 09:57:49 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.36,160,1486454400\"; d=\"scan'208\";a=\"59709004\"", "From": "Paul Greenwalt <paul.greenwalt@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 13 Mar 2017 05:47:56 -0400", "Message-Id": "<1489398476-15893-1-git-send-email-paul.greenwalt@intel.com>", "X-Mailer": "git-send-email 2.7.4", "Subject": "[Intel-wired-lan] [PATCH] ixgbe: Acquire PHY semaphore before\n\tdevice reset", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.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@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "A recent firmware change fixed an issue to acquire the PHY semaphore before\naccessing PHY registers. This led to a case where SW can issue a device\nreset clearing the MDIO registers. This patch makes SW acquire the PHY\nsemaphore before issuing a device reset.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 8 ++++++++\n drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 8 ++++++++\n 2 files changed, 16 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\nindex 84a467a..6ea0d6a 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c\n@@ -95,6 +95,7 @@ s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)\n {\n \ts32 status;\n \tu32 ctrl, i;\n+\tu32 swfw_mask = hw->phy.phy_semaphore_mask;\n \n \t/* Call adapter stop to disable tx/rx and clear interrupts */\n \tstatus = hw->mac.ops.stop_adapter(hw);\n@@ -105,10 +106,17 @@ s32 ixgbe_reset_hw_X540(struct ixgbe_hw *hw)\n \tixgbe_clear_tx_pending(hw);\n \n mac_reset_top:\n+\tstatus = hw->mac.ops.acquire_swfw_sync(hw, swfw_mask);\n+\tif (status) {\n+\t\thw_dbg(hw, \"semaphore failed with %d\", status);\n+\t\treturn IXGBE_ERR_SWFW_SYNC;\n+\t}\n+\n \tctrl = IXGBE_CTRL_RST;\n \tctrl |= IXGBE_READ_REG(hw, IXGBE_CTRL);\n \tIXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);\n \tIXGBE_WRITE_FLUSH(hw);\n+\thw->mac.ops.release_swfw_sync(hw, swfw_mask);\n \tusleep_range(1000, 1200);\n \n \t/* Poll for reset bit to self-clear indicating reset is complete */\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\nindex 200f847..c862c6d 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c\n@@ -3300,6 +3300,7 @@ static s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)\n \tu32 ctrl = 0;\n \tu32 i;\n \tbool link_up = false;\n+\tu32 swfw_mask = hw->phy.phy_semaphore_mask;\n \n \t/* Call adapter stop to disable Tx/Rx and clear interrupts */\n \tstatus = hw->mac.ops.stop_adapter(hw);\n@@ -3345,9 +3346,16 @@ static s32 ixgbe_reset_hw_X550em(struct ixgbe_hw *hw)\n \t\t\tctrl = IXGBE_CTRL_RST;\n \t}\n \n+\tstatus = hw->mac.ops.acquire_swfw_sync(hw, swfw_mask);\n+\tif (status) {\n+\t\thw_dbg(hw, \"semaphore failed with %d\", status);\n+\t\treturn IXGBE_ERR_SWFW_SYNC;\n+\t}\n+\n \tctrl |= IXGBE_READ_REG(hw, IXGBE_CTRL);\n \tIXGBE_WRITE_REG(hw, IXGBE_CTRL, ctrl);\n \tIXGBE_WRITE_FLUSH(hw);\n+\thw->mac.ops.release_swfw_sync(hw, swfw_mask);\n \tusleep_range(1000, 1200);\n \n \t/* Poll for reset bit to self-clear meaning reset is complete */\n", "prefixes": [] }