ixgbe: add WOL support for SFP+ subdevice

This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9.  This
will also include ixgbe ethtool support for this device.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 22 insertions, 5 deletions

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index f9b58394fbb6..ef3f9105a05d 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1879,7 +1879,16 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
         struct ixgbe_hw *hw = &adapter->hw;
         int retval = 1;
 
+        /* WOL not supported except for the following */
         switch(hw->device_id) {
+        case IXGBE_DEV_ID_82599_SFP:
+                /* Only this subdevice supports WOL */
+                if (hw->subsystem_device_id != IXGBE_SUBDEV_ID_82599_SFP) {
+                        wol->supported = 0;
+                        break;
+                }
+                retval = 0;
+                break;
         case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
                 /* All except this subdevice support WOL */
                 if (hw->subsystem_device_id ==
@@ -1887,6 +1896,8 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
                         wol->supported = 0;
                         break;
                 }
+                retval = 0;
+                break;
         case IXGBE_DEV_ID_82599_KX4:
                 retval = 0;
                 break;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 5861ece70207..5f4c93d40a45 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -7223,13 +7223,18 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                 goto err_sw_init;
 
         switch (pdev->device) {
+        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);
+                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 = 0;
-                        break;
-                }
+                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);
+                break;
         case IXGBE_DEV_ID_82599_KX4:
                 adapter->wol = (IXGBE_WUFC_MAG | IXGBE_WUFC_EX |
                                 IXGBE_WUFC_MC | IXGBE_WUFC_BC);
diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
index 42c607339a62..9557ae64f951 100644
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
@@ -54,6 +54,7 @@
 #define IXGBE_DEV_ID_82599_T3_LOM        0x151C
 #define IXGBE_DEV_ID_82599_CX4           0x10F9
 #define IXGBE_DEV_ID_82599_SFP           0x10FB
+#define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
 #define IXGBE_DEV_ID_82599_SFP_EM        0x1507
 #define IXGBE_DEV_ID_82599_XAUI_LOM      0x10FC
 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8