Patchwork [net-2.6] ixgbe: only enable WoL for magic packet by default

login
register
mail settings
Submitter Andy Gospodarek
Date April 7, 2011, 2:41 p.m.
Message ID <1302187315-16487-1-git-send-email-andy@greyhouse.net>
Download mbox | patch
Permalink /patch/90186/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Andy Gospodarek - April 7, 2011, 2:41 p.m.
Martin Wilck <martin.wilck@ts.fujitsu.com> reported that systems using
the ixgbe-driver that were capable of WoL were rebooting almost as soon
as they were shut down.  This is because the default WoL settings
enabled magic packet, broadcast, unicast, and multicast.

Other Intel devices seem to use the stored eeprom value for initial WoL
capabilities.  The 82578DM (e1000e) and 82576 (igb) the devices I looked
at had only the magic packet enabled in the eeprom, so that seems
appropriate on ixgbe-based devices as well.  I set the WoL options on my
82578DM to be the same default as the ixgbe devices (umbg) and saw the
same as Martin -- almost as soon as my box shutdown, it booted again.

This patch changes the default to only be the magic packet.  This is the
same as the default for most Intel and non-Intel hardware currently
upstream.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
CC: Martin Wilck <martin.wilck@ts.fujitsu.com>
 
---
 drivers/net/ixgbe/ixgbe_main.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Kirsher - April 8, 2011, 6:13 p.m.
On Thu, Apr 7, 2011 at 07:41, Andy Gospodarek <andy@greyhouse.net> wrote:
> Martin Wilck <martin.wilck@ts.fujitsu.com> reported that systems using
> the ixgbe-driver that were capable of WoL were rebooting almost as soon
> as they were shut down.  This is because the default WoL settings
> enabled magic packet, broadcast, unicast, and multicast.
>
> Other Intel devices seem to use the stored eeprom value for initial WoL
> capabilities.  The 82578DM (e1000e) and 82576 (igb) the devices I looked
> at had only the magic packet enabled in the eeprom, so that seems
> appropriate on ixgbe-based devices as well.  I set the WoL options on my
> 82578DM to be the same default as the ixgbe devices (umbg) and saw the
> same as Martin -- almost as soon as my box shutdown, it booted again.
>
> This patch changes the default to only be the magic packet.  This is the
> same as the default for most Intel and non-Intel hardware currently
> upstream.
>
> Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
> CC: Martin Wilck <martin.wilck@ts.fujitsu.com>
>

Thanks Andy! I have added the patch to my queue.

Patch

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f17e4a7..379b465 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7439,18 +7439,15 @@  static int __devinit ixgbe_probe(struct pci_dev *pdev,
 	case IXGBE_DEV_ID_82599_SFP:
 		/* Only this subdevice supports WOL */
 		if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)
-			adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX |
-			                IXGBE_WUFC_MC | IXGBE_WUFC_BC);
+			adapter->wol = IXGBE_WUFC_MAG;
 		break;
 	case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
 		/* All except this subdevice support WOL */
 		if (pdev->subsystem_device != IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ)
-			adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX |
-			                IXGBE_WUFC_MC | IXGBE_WUFC_BC);
+			adapter->wol = IXGBE_WUFC_MAG;
 		break;
 	case IXGBE_DEV_ID_82599_KX4:
-		adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX |
-				IXGBE_WUFC_MC | IXGBE_WUFC_BC);
+		adapter->wol = IXGBE_WUFC_MAG;
 		break;
 	default:
 		adapter->wol = 0;