e100: Don't enable WoL by default on Toshiba devices

PATCH In review Ondrej Zary 3 participants 9 messages Nov 12, 2014 – Jan 15, 2015

Subsystems (3)

Networking Network drivers Intel Ethernet

lore

Share & tools

lore

Ondrej Zary

author

2014-11-12 22:47 UTC #0 lore raw

PATCH 1/1 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(-)

drivers/net/ethernet/intel/e100.c +6 -3

index 781065e..daf8fcc 100644
@@ -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);
 	}

Signature · 1 line

Ondrej Zary

David Miller

maintainer

2014-11-12 23:18 UTC #1 lore raw

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

Quoted 10 lines

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?

Jeff Kirsher

2014-11-13 03:38 UTC #2 lore raw

Quoted 7 lines · David Miller

From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 4 lines
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.

Quoted 8 lines

Quoted 6 lines
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.

------------------------------------------------------------------------------
Comprehensive Server Monitoring with Site24x7.
Monitor 10 servers for $9/Month.
Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device.
http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk

_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired

Ondrej Zary

author

2014-12-12 21:11 UTC #3 lore raw

Quoted 12 lines · On Thursday 13 November 2014 04:38:47 Jeff Kirsher wrote:

Quoted 11 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 8 lines
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.

Quoted 7 lines

Quoted 5 lines
Quoted 3 lines
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?

Signature · 1 line

Ondrej Zary

Ondrej Zary

author

2015-01-15 13:40 UTC #4 lore raw

In reply to Jeff Kirsher

Quoted 12 lines · Jeff Kirsher

Quoted 11 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 8 lines
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.

Quoted 7 lines

Quoted 5 lines
Quoted 3 lines
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.

What happened to this patch? I don't see it in net.git or net-next.git (checked both davem's and jkirsher's)

Signature · 1 line

Ondrej Zary

Jeff Kirsher

2015-01-15 14:53 UTC #5 lore raw

Quoted 22 lines · Ondrej Zary

Quoted 5 lines · Jeff Kirsher
Quoted 4 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 1 line
Enabling WoL on some Toshiba laptops (such as Portege R100)
causes
Quoted 1 line
Quoted 1 line
Quoted 1 line
battery drain after shutdown (WoL is active even on battery).
These
Quoted 1 line
Quoted 1 line
Quoted 1 line
laptops have the WoL bit set in EEPROM ID, causing e100 driver
to
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
enable WoL by default.
Check subsystem vendor ID and if it's Toshiba, don't enable WoL
by
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
default from EEPROM settings.
Fixes
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Signed-off-by Ondrej Zary <[email protected]>

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
Jeff, are you gonna pick this up?
Yes, sorry I did not catch it earlier.
What happened to this patch? I don't see it in net.git or net-next.git
(checked both davem's and jkirsher's)

Sorry, I thought I had replied with a NAK on this patch after further review of the changes.

We don't fix BIOS issues in the driver especially regarding feature enablement like WoL. We would end up with dozens of these kinds of fixes if we to allow this.

You should go back to the OEM and ask for a BIOS update to resolve this or configure udev so that ethtool disables WoL.

Ondrej Zary

author

2015-01-15 15:18 UTC #6 lore raw

Quoted 43 lines · Jeff Kirsher

Quoted 31 lines · Ondrej Zary
Quoted 5 lines · Jeff Kirsher
Quoted 4 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 1 line
Enabling WoL on some Toshiba laptops (such as Portege R100)
causes
Quoted 1 line
Quoted 1 line
Quoted 1 line
battery drain after shutdown (WoL is active even on battery).
These
Quoted 1 line
Quoted 1 line
Quoted 1 line
laptops have the WoL bit set in EEPROM ID, causing e100 driver
to
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
enable WoL by default.
Check subsystem vendor ID and if it's Toshiba, don't enable WoL
by
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
default from EEPROM settings.
Fixes
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Ondrej Zary <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Jeff, are you gonna pick this up?
Yes, sorry I did not catch it earlier.
What happened to this patch? I don't see it in net.git or net-next.git
(checked both davem's and jkirsher's)
Sorry, I thought I had replied with a NAK on this patch after further review of the changes.

Quoted 6 lines

We don't fix BIOS issues in the driver especially regarding feature enablement like WoL. We would end up with dozens of these kinds of fixes if we to allow this.
You should go back to the OEM and ask for a BIOS update to resolve this or configure udev so that ethtool disables WoL.

This is not a BIOS bug. When the machine is powered off in BIOS (or GRUB), everything is OK.

The bug is that e100 driver enables WoL based on some bit in EEPROM that happens to be set on at least some Toshiba laptops and user has no way to change it. Windows driver does not do this. Other Linux ethernet drivers don't do this. When user wants WoL, (s)he enables it in BIOS and OS. Maybe this (mis)feature should be removed from the driver.

Signature · 13 lines

Ondrej Zary

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
E1000-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel&#174; Ethernet, visit http://communities.intel.com/community/wired

Jeff Kirsher

2015-01-15 15:31 UTC #7 lore raw

Quoted 51 lines · Ondrej Zary

Quoted 43 lines · Jeff Kirsher
Quoted 31 lines · Ondrej Zary
Quoted 5 lines · Jeff Kirsher
Quoted 4 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 1 line
Enabling WoL on some Toshiba laptops (such as Portege R100)
causes
Quoted 1 line
Quoted 1 line
Quoted 1 line
battery drain after shutdown (WoL is active even on battery).
These
Quoted 1 line
Quoted 1 line
Quoted 1 line
laptops have the WoL bit set in EEPROM ID, causing e100 driver
to
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
enable WoL by default.
Check subsystem vendor ID and if it's Toshiba, don't enable WoL
by
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
default from EEPROM settings.
Fixes
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Ondrej Zary <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Jeff, are you gonna pick this up?
Yes, sorry I did not catch it earlier.
What happened to this patch? I don't see it in net.git or net-next.git
(checked both davem's and jkirsher's)
Sorry, I thought I had replied with a NAK on this patch after further review of the changes.
Quoted 6 lines
We don't fix BIOS issues in the driver especially regarding feature enablement like WoL. We would end up with dozens of these kinds of fixes if we to allow this.
You should go back to the OEM and ask for a BIOS update to resolve this or configure udev so that ethtool disables WoL.

Quoted 6 lines

This is not a BIOS bug. When the machine is powered off in BIOS (or GRUB), everything is OK.
The bug is that e100 driver enables WoL based on some bit in EEPROM that happens to be set on at least some Toshiba laptops and user has no way to change it.

Yes, the EEPROM can be modified/updated through the BIOS update I suggested earlier. So again, a BIOS issue.

OR you can configure udev so that ethtool disables WoL if you do not want to pursue a EEPROM update through a BIOS update.

Quoted 4 lines

Windows driver does not do this. Other Linux ethernet drivers
don't do this. When user wants WoL, (s)he enables it in BIOS and OS. Maybe this (mis)feature should be removed from the driver.

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet

Ondrej Zary

author

2015-01-15 20:15 UTC #8 lore raw

Quoted 55 lines · On Thursday 15 January 2015 16:31:04 Jeff Kirsher wrote:

Quoted 54 lines · Ondrej Zary
Quoted 43 lines · Jeff Kirsher
Quoted 31 lines · Ondrej Zary
Quoted 5 lines · Jeff Kirsher
Quoted 4 lines · David Miller
From: Ondrej Zary <[email protected]>
Date: Wed, 12 Nov 2014 23:47:25 +0100
Quoted 1 line
Enabling WoL on some Toshiba laptops (such as Portege R100)
causes
Quoted 1 line
Quoted 1 line
Quoted 1 line
battery drain after shutdown (WoL is active even on battery).
These
Quoted 1 line
Quoted 1 line
Quoted 1 line
laptops have the WoL bit set in EEPROM ID, causing e100 driver
to
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
enable WoL by default.
Check subsystem vendor ID and if it's Toshiba, don't enable WoL
by
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
default from EEPROM settings.
Fixes
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/110784
Quoted 2 lines
Quoted 2 lines
Quoted 1 line
Signed-off-by Ondrej Zary <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Jeff, are you gonna pick this up?
Yes, sorry I did not catch it earlier.
What happened to this patch? I don't see it in net.git or net-next.git
(checked both davem's and jkirsher's)
Sorry, I thought I had replied with a NAK on this patch after further review of the changes.
Quoted 6 lines
We don't fix BIOS issues in the driver especially regarding feature enablement like WoL. We would end up with dozens of these kinds of fixes if we to allow this.
You should go back to the OEM and ask for a BIOS update to resolve this or configure udev so that ethtool disables WoL.
This is not a BIOS bug. When the machine is powered off in BIOS (or GRUB), everything is OK.

Quoted 6 lines

Quoted 3 lines
The bug is that e100 driver enables WoL based on some bit in EEPROM that happens to be set on at least some Toshiba laptops and user has no way to change it.
Yes, the EEPROM can be modified/updated through the BIOS update I suggested earlier. So again, a BIOS issue.

The machine has already the latest BIOS and it's unlikely that Toshiba will release a new version for old laptops.

Quoted 2 lines

OR you can configure udev so that ethtool disables WoL if you do not want to pursue a EEPROM update through a BIOS update.

I can configure udev but what about other people that install Linux and expect it to work (not drain battery after shutdown)? Without needing to know what udev, ethtool or WoL is.

Quoted 3 lines

Quoted 3 lines
Windows driver does not do this. Other Linux ethernet drivers
don't do this. When user wants WoL, (s)he enables it in BIOS and OS. Maybe this (mis)feature should be removed from the driver.

Signature · 1 line

Ondrej Zary