netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Andy Gospodarek <andy@greyhouse.net>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Martin Wilck <martin.wilck@ts.fujitsu.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 09/10] ixgbe: only enable WoL for magic packet by default
Date: Thu, 21 Jul 2011 19:01:17 -0700	[thread overview]
Message-ID: <1311300078-12876-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1311300078-12876-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Andy Gospodarek <andy@greyhouse.net>

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>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ixgbe/ixgbe_main.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index d448124..3f1715b 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7515,18 +7515,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;
-- 
1.7.6


  parent reply	other threads:[~2011-07-22  2:01 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-22  2:01 [net-next 00/10][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-07-22  2:01 ` [net-next 01/10] e1000: always call e1000_check_for_link() on e1000_ce4100 MACs Jeff Kirsher
2011-07-22  2:01 ` [net-next 02/10] igb: Fix for DH89xxCC near end loopback test Jeff Kirsher
2011-07-22  2:01 ` [net-next 03/10] ixgbe: Update ATR to use recorded TX queues instead of CPU for routing Jeff Kirsher
2011-07-22  2:01 ` [net-next 04/10] ixgbe: inline the ixgbe_maybe_stop_tx function Jeff Kirsher
2011-07-22  2:01 ` [net-next 05/10] ixgbe: add structure for containing RX/TX rings to q_vector Jeff Kirsher
2011-07-22  2:01 ` [net-next 06/10] ixgbe: Move interrupt related values out of ring and into q_vector Jeff Kirsher
2011-07-22  2:01 ` [net-next 07/10] ixgbe: Pass staterr instead of re-reading status and error bits from descriptor Jeff Kirsher
2011-07-22  2:01 ` [net-next 08/10] ixgbe: remove ifdef check for non-existent define Jeff Kirsher
2011-07-22  2:01 ` Jeff Kirsher [this message]
2011-07-22  2:01 ` [net-next 10/10] ixgbe: convert to ndo_fix_features Jeff Kirsher
2011-07-22  3:39 ` [net-next 00/10][pull request] Intel Wired LAN Driver Update David Miller
2011-07-22  4:31   ` Jeff Kirsher
  -- strict thread matches above, loose matches on Subject: below --
2011-07-22  6:09 [net-next 00/10 v2][pull " Jeff Kirsher
2011-07-22  6:09 ` [net-next 09/10] ixgbe: only enable WoL for magic packet by default Jeff Kirsher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311300078-12876-10-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=andy@greyhouse.net \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=martin.wilck@ts.fujitsu.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).