Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1295740/?format=api
{ "id": 1295740, "url": "http://patchwork.ozlabs.org/api/patches/1295740/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/9f7ede2e2e8152704258fc11ba3755ae93f50741.1590081982.git.yu.c.chen@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": "<9f7ede2e2e8152704258fc11ba3755ae93f50741.1590081982.git.yu.c.chen@intel.com>", "list_archive_url": null, "date": "2020-05-21T17:59:00", "name": "[1/2] e1000e: Do not wake up the system via WOL if device wakeup is disabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "25e3fe5c7f195b0a8ce9652d320e46dda9e9deb0", "submitter": { "id": 69112, "url": "http://patchwork.ozlabs.org/api/people/69112/?format=api", "name": "Chen, Yu C", "email": "yu.c.chen@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/9f7ede2e2e8152704258fc11ba3755ae93f50741.1590081982.git.yu.c.chen@intel.com/mbox/", "series": [ { "id": 178549, "url": "http://patchwork.ozlabs.org/api/series/178549/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=178549", "date": "2020-05-21T17:58:02", "name": "Make WOL of e1000e consistent with sysfs device wakeup", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/178549/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1295740/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1295740/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 spf=pass (sender SPF authorized) smtp.mailfrom=osuosl.org\n (client-ip=140.211.166.136; helo=silver.osuosl.org;\n envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=<UNKNOWN>)", "ozlabs.org;\n dmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 49SksH52Chz9sSs\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 22 May 2020 08:32:51 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id AD94225067;\n\tThu, 21 May 2020 22:32:49 +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 O0gNieS+OCT5; Thu, 21 May 2020 22:32:43 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 6306C24F3A;\n\tThu, 21 May 2020 22:32:42 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n by ash.osuosl.org (Postfix) with ESMTP id BB2141BF3A0\n for <intel-wired-lan@lists.osuosl.org>; Thu, 21 May 2020 17:58:59 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n by fraxinus.osuosl.org (Postfix) with ESMTP id B6A408545F\n for <intel-wired-lan@lists.osuosl.org>; Thu, 21 May 2020 17:58:59 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n with ESMTP id dtpNZL-YYEj1 for <intel-wired-lan@lists.osuosl.org>;\n Thu, 21 May 2020 17:58:59 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by fraxinus.osuosl.org (Postfix) with ESMTPS id 0400A85450\n for <intel-wired-lan@lists.osuosl.org>; Thu, 21 May 2020 17:58:58 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 May 2020 10:58:58 -0700", "from chenyu-office.sh.intel.com ([10.239.158.173])\n by orsmga004.jf.intel.com with ESMTP; 21 May 2020 10:58:55 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "\n LRGNQvV/FoD8ASVE3H5RwYmwcVOiW6iHZeRqig6/pXNNAe64nFpGv8ICGEttk1JIqBKtotsdaS\n /T7nziUbnsPQ==", "\n vfZIJeCGZ+wuj1JpsKcKRlwabLNciBmrm7H/gke8Nz1ctfBKilF6hmUvudflKRDrPWEJVhXROm\n AzdpwRYBsNyA==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.73,418,1583222400\"; d=\"scan'208\";a=\"412486010\"", "From": "Chen Yu <yu.c.chen@intel.com>", "To": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>,\n \"David S. Miller\" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,\n Auke Kok <auke-jan.h.kok@intel.com>, Jeff Garzik <jeff@garzik.org>", "Date": "Fri, 22 May 2020 01:59:00 +0800", "Message-Id": "\n <9f7ede2e2e8152704258fc11ba3755ae93f50741.1590081982.git.yu.c.chen@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<cover.1590081982.git.yu.c.chen@intel.com>", "References": "<cover.1590081982.git.yu.c.chen@intel.com>", "X-Mailman-Approved-At": "Thu, 21 May 2020 22:32:40 +0000", "Subject": "[Intel-wired-lan] [PATCH 1/2] e1000e: Do not wake up the system via\n WOL if device wakeup is disabled", "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 <intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>,\n <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 <mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Len Brown <len.brown@intel.com>, \"Shevchenko,\n Andriy\" <andriy.shevchenko@intel.com>, netdev@vger.kernel.org,\n \"Rafael J. Wysocki\" <rjw@rjwysocki.net>, linux-kernel@vger.kernel.org,\n Stable@vger.kernel.org, intel-wired-lan@lists.osuosl.org,\n Chen Yu <yu.c.chen@intel.com>", "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": "Currently the system will be woken up via WOL(Wake On Lan) even if the\ndevice wakeup ability has been disabled via sysfs:\n cat /sys/devices/pci0000:00/0000:00:1f.6/power/wakeup\n disabled\n\nThe system should not be woken up if the user has explicitly\ndisabled the wake up ability for this device.\n\nThis patch clears the WOL ability of this network device if the\nuser has disabled the wake up ability in sysfs.\n\nFixes: bc7f75fa9788 (\"[E1000E]: New pci-express e1000 driver\")\nReported-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>\nReviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>\nCc: <Stable@vger.kernel.org>\nSigned-off-by: Chen Yu <yu.c.chen@intel.com>\n---\n drivers/net/ethernet/intel/e1000e/netdev.c | 14 ++++++++++----\n 1 file changed, 10 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\nindex 177c6da80c57..f6f730388705 100644\n--- a/drivers/net/ethernet/intel/e1000e/netdev.c\n+++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n@@ -6516,11 +6516,17 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)\n \tstruct net_device *netdev = pci_get_drvdata(pdev);\n \tstruct e1000_adapter *adapter = netdev_priv(netdev);\n \tstruct e1000_hw *hw = &adapter->hw;\n-\tu32 ctrl, ctrl_ext, rctl, status;\n-\t/* Runtime suspend should only enable wakeup for link changes */\n-\tu32 wufc = runtime ? E1000_WUFC_LNKC : adapter->wol;\n+\tu32 ctrl, ctrl_ext, rctl, status, wufc;\n \tint retval = 0;\n \n+\t/* Runtime suspend should only enable wakeup for link changes */\n+\tif (runtime)\n+\t\twufc = E1000_WUFC_LNKC;\n+\telse if (device_may_wakeup(&pdev->dev))\n+\t\twufc = adapter->wol;\n+\telse\n+\t\twufc = 0;\n+\n \tstatus = er32(STATUS);\n \tif (status & E1000_STATUS_LU)\n \t\twufc &= ~E1000_WUFC_LNKC;\n@@ -6577,7 +6583,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)\n \tif (adapter->hw.phy.type == e1000_phy_igp_3) {\n \t\te1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);\n \t} else if (hw->mac.type >= e1000_pch_lpt) {\n-\t\tif (!(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))\n+\t\tif (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))\n \t\t\t/* ULP does not support wake from unicast, multicast\n \t\t\t * or broadcast.\n \t\t\t */\n", "prefixes": [ "1/2" ] }