lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 096/191] e1000e: Do not wake up the system via WOL if device wakeup is disabled
    Date
    From: Chen Yu <yu.c.chen@intel.com>

    [ Upstream commit 6bf6be1127f7e6d4bf39f84d56854e944d045d74 ]

    Currently the system will be woken up via WOL(Wake On LAN) even if the
    device wakeup ability has been disabled via sysfs:
    cat /sys/devices/pci0000:00/0000:00:1f.6/power/wakeup
    disabled

    The system should not be woken up if the user has explicitly
    disabled the wake up ability for this device.

    This patch clears the WOL ability of this network device if the
    user has disabled the wake up ability in sysfs.

    Fixes: bc7f75fa9788 ("[E1000E]: New pci-express e1000 driver")
    Reported-by: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
    Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Chen Yu <yu.c.chen@intel.com>
    Tested-by: Aaron Brown <aaron.f.brown@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/e1000e/netdev.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
    index be324b4761eb6..3c01bc43889a2 100644
    --- a/drivers/net/ethernet/intel/e1000e/netdev.c
    +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
    @@ -6315,11 +6315,17 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
    struct net_device *netdev = pci_get_drvdata(pdev);
    struct e1000_adapter *adapter = netdev_priv(netdev);
    struct e1000_hw *hw = &adapter->hw;
    - u32 ctrl, ctrl_ext, rctl, status;
    - /* Runtime suspend should only enable wakeup for link changes */
    - u32 wufc = runtime ? E1000_WUFC_LNKC : adapter->wol;
    + u32 ctrl, ctrl_ext, rctl, status, wufc;
    int retval = 0;

    + /* Runtime suspend should only enable wakeup for link changes */
    + if (runtime)
    + wufc = E1000_WUFC_LNKC;
    + else if (device_may_wakeup(&pdev->dev))
    + wufc = adapter->wol;
    + else
    + wufc = 0;
    +
    status = er32(STATUS);
    if (status & E1000_STATUS_LU)
    wufc &= ~E1000_WUFC_LNKC;
    @@ -6377,7 +6383,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime)
    e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);
    } else if ((hw->mac.type == e1000_pch_lpt) ||
    (hw->mac.type == e1000_pch_spt)) {
    - if (!(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))
    + if (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))
    /* ULP does not support wake from unicast, multicast
    * or broadcast.
    */
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:26    [W:4.299 / U:1.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site