2014-11-12 22:47:36

by Ondrej Zary

[permalink] [raw]
Subject: [PATCH] e100: Don't enable WoL by default on Toshiba devices

Enabling WoL on some Toshiba laptops (such as Portege R100) causes battery
drain after shutdown (WoL is active even on battery). These laptops have the
WoL bit set in EEPROM ID, causing e100 driver to enable WoL by default.

Check subsystem vendor ID and if it's Toshiba, don't enable WoL by default
from EEPROM settings.

Fixes https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784

Signed-off-by: Ondrej Zary <[email protected]>
---
drivers/net/ethernet/intel/e100.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 781065e..daf8fcc 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2949,9 +2949,12 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
}

- /* Wol magic packet can be enabled from eeprom */
- if ((nic->mac >= mac_82558_D101_A4) &&
- (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
+ /* Wol magic packet can be enabled from eeprom
+ * Don't enable WoL by default on Toshiba laptops as it causes battery
+ * drain after shutdown */
+ if ((pdev->subsystem_vendor != PCI_VENDOR_ID_TOSHIBA) &&
+ (nic->mac >= mac_82558_D101_A4) &&
+ (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
nic->flags |= wol_magic;
device_set_wakeup_enable(&pdev->dev, true);
}
--
Ondrej Zary


2014-11-12 23:18:17

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] e100: Don't enable WoL by default on Toshiba devices

From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100

> Enabling WoL on some Toshiba laptops (such as Portege R100) causes battery
> drain after shutdown (WoL is active even on battery). These laptops have the
> WoL bit set in EEPROM ID, causing e100 driver to enable WoL by default.
>
> Check subsystem vendor ID and if it's Toshiba, don't enable WoL by default
> from EEPROM settings.
>
> Fixes https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
>
> Signed-off-by: Ondrej Zary <[email protected]>

Jeff, are you gonna pick this up?

2014-11-13 03:38:50

by Jeff Kirsher

[permalink] [raw]
Subject: Re: [PATCH] e100: Don't enable WoL by default on Toshiba devices

On Wed, 2014-11-12 at 18:18 -0500, David Miller wrote:
> From: Ondrej Zary <[email protected]>
> Date: Wed, 12 Nov 2014 23:47:25 +0100
>
> > Enabling WoL on some Toshiba laptops (such as Portege R100) causes battery
> > drain after shutdown (WoL is active even on battery). These laptops have the
> > WoL bit set in EEPROM ID, causing e100 driver to enable WoL by default.
> >
> > Check subsystem vendor ID and if it's Toshiba, don't enable WoL by default
> > from EEPROM settings.
> >
> > Fixes https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
> >
> > Signed-off-by: Ondrej Zary <[email protected]>
>
> Jeff, are you gonna pick this up?

Yes, sorry I did not catch it earlier.

Attachments:
signature.asc (819.00 B)
This is a digitally signed message part

2014-12-12 21:12:10

by Ondrej Zary

[permalink] [raw]
Subject: Re: [PATCH] e100: Don't enable WoL by default on Toshiba devices

On Thursday 13 November 2014 04:38:47 Jeff Kirsher wrote:
> On Wed, 2014-11-12 at 18:18 -0500, David Miller wrote:
> > From: Ondrej Zary <[email protected]>
> > Date: Wed, 12 Nov 2014 23:47:25 +0100
> >
> > > Enabling WoL on some Toshiba laptops (such as Portege R100) causes
> > > battery drain after shutdown (WoL is active even on battery). These
> > > laptops have the WoL bit set in EEPROM ID, causing e100 driver to
> > > enable WoL by default.
> > >
> > > Check subsystem vendor ID and if it's Toshiba, don't enable WoL by
> > > default from EEPROM settings.
> > >
> > > Fixes https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
> > >
> > > Signed-off-by: Ondrej Zary <[email protected]>
> >
> > Jeff, are you gonna pick this up?
>
> Yes, sorry I did not catch it earlier.

Will this go in 3.19?

--
Ondrej Zary