From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Todd Fujinaka <todd.fujinaka@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 13/20] igb: enable WoL for OEM devices regardless of EEPROM setting
Date: Tue, 23 Feb 2016 20:26:17 -0800 [thread overview]
Message-ID: <1456287984-10459-14-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1456287984-10459-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Todd Fujinaka <todd.fujinaka@intel.com>
Override EEPROM settings for specific OEM devices.
Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 0f7805c..cd3708b 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2584,6 +2584,26 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
adapter->wol = 0;
}
+ /* Some vendors want the ability to Use the EEPROM setting as
+ * enable/disable only, and not for capability
+ */
+ if (((hw->mac.type == e1000_i350) ||
+ (hw->mac.type == e1000_i354)) &&
+ (pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)) {
+ adapter->flags |= IGB_FLAG_WOL_SUPPORTED;
+ adapter->wol = 0;
+ }
+ if (hw->mac.type == e1000_i350) {
+ if (((pdev->subsystem_device == 0x5001) ||
+ (pdev->subsystem_device == 0x5002)) &&
+ (hw->bus.func == 0)) {
+ adapter->flags |= IGB_FLAG_WOL_SUPPORTED;
+ adapter->wol = 0;
+ }
+ if (pdev->subsystem_device == 0x1F52)
+ adapter->flags |= IGB_FLAG_WOL_SUPPORTED;
+ }
+
device_set_wakeup_enable(&adapter->pdev->dev,
adapter->flags & IGB_FLAG_WOL_SUPPORTED);
--
2.5.0
next prev parent reply other threads:[~2016-02-24 4:26 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 4:26 [net-next 00/20][pull request] 1GbE Intel Wired LAN Driver Updates 2016-02-23 Jeff Kirsher
2016-02-24 4:26 ` [net-next 01/20] e1000e: Increase ULP timer Jeff Kirsher
2016-02-24 4:26 ` [net-next 02/20] e1000e: Increase PHY PLL clock gate timing Jeff Kirsher
2016-02-24 4:26 ` [net-next 03/20] e1000e: Set HW FIFO minimum pointer gap for non-gig speeds Jeff Kirsher
2016-02-24 4:26 ` [net-next 04/20] e1000e: Clear ULP configuration register on ULP exit Jeff Kirsher
2016-02-24 4:26 ` [net-next 05/20] e1000e: Initial support for KabeLake Jeff Kirsher
2016-02-24 4:26 ` [net-next 06/20] igb: add function to set I210 transmit mode Jeff Kirsher
2016-02-24 4:26 ` [net-next 07/20] igb: add a character device to support AVB Jeff Kirsher
2016-02-24 20:06 ` Or Gerlitz
2016-02-24 21:45 ` David Miller
2016-02-24 21:50 ` Jeff Kirsher
2016-02-24 4:26 ` [net-next 08/20] igb: fix compare_const_fl.cocci warnings Jeff Kirsher
2016-02-24 4:26 ` [net-next 09/20] igb: fix itnull.cocci warnings Jeff Kirsher
2016-02-24 4:26 ` [net-next 10/20] igb: fix semicolon.cocci warnings Jeff Kirsher
2016-02-24 4:26 ` [net-next 11/20] igb: When GbE link up, wait for Remote receiver status condition Jeff Kirsher
2016-02-24 4:26 ` [net-next 12/20] igb: constify e1000_phy_operations structure Jeff Kirsher
2016-02-24 4:26 ` Jeff Kirsher [this message]
2016-02-24 4:26 ` [net-next 14/20] igb: add conditions for I210 to generate periodic clock output Jeff Kirsher
2016-02-24 4:26 ` [net-next 15/20] igb: rename igb define to be more generic Jeff Kirsher
2016-02-24 4:26 ` [net-next 16/20] igb: Add support for generic Tx checksums Jeff Kirsher
2016-02-24 4:26 ` [net-next 17/20] igbvf: " Jeff Kirsher
2016-02-24 4:26 ` [net-next 18/20] igbvf: remove "link is Up" message when registering mcast address Jeff Kirsher
2016-02-24 4:26 ` [net-next 19/20] igb: Fix VLAN tag stripping on Intel i350 Jeff Kirsher
2016-02-24 4:26 ` [net-next 20/20] igb: call ndo_stop() instead of dev_close() when running offline selftest 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=1456287984-10459-14-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
--cc=todd.fujinaka@intel.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).