ixgbe: add WOL support for some 82599 subdevice IDs
Subsystems (2)
PATCH 1/2 ixgbe: add WOL support for some 82599 subdevice IDs
We had some 82599 subdevice IDs missing from the list of parts that support WOL.
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 ++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +6 -2
@@ -9202,8 +9202,10 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,case IXGBE_DEV_ID_82599_SFP :/* Only these subdevices could supports WOL */ switch (subdevice_id) { -case IXGBE_SUBDEV_ID_82599_SFP_WOL0 :case IXGBE_SUBDEV_ID_82599_560FLR : +case IXGBE_SUBDEV_ID_82599_LOM_SNAP6 : +case IXGBE_SUBDEV_ID_82599_SFP_WOL0 : +case IXGBE_SUBDEV_ID_82599_SFP_2OCP :/* only support first port */ if (hw->bus.func !=0 )break ;
@@ -9211,7 +9213,9 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,case IXGBE_SUBDEV_ID_82599_SFP :case IXGBE_SUBDEV_ID_82599_RNDC :case IXGBE_SUBDEV_ID_82599_ECNA_DP : -case IXGBE_SUBDEV_ID_82599_LOM_SFP : +case IXGBE_SUBDEV_ID_82599_SFP_1OCP : +case IXGBE_SUBDEV_ID_82599_SFP_LOM_OEM1 : +case IXGBE_SUBDEV_ID_82599_SFP_LOM_OEM2 : is_wol_supported =1 ;break ; }
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +5 -1
@@ -59,8 +59,12 @@#define IXGBE_SUBDEV_ID_82599_RNDC 0x1F72#define IXGBE_SUBDEV_ID_82599_560FLR 0x17D0#define IXGBE_SUBDEV_ID_82599_SP_560FLR 0x211B +#define IXGBE_SUBDEV_ID_82599_LOM_SNAP6 0x2159 +#define IXGBE_SUBDEV_ID_82599_SFP_1OCP 0x000D +#define IXGBE_SUBDEV_ID_82599_SFP_2OCP 0x0008 +#define IXGBE_SUBDEV_ID_82599_SFP_LOM_OEM1 0x8976 +#define IXGBE_SUBDEV_ID_82599_SFP_LOM_OEM2 0x06EE#define IXGBE_SUBDEV_ID_82599_ECNA_DP 0x0470 -#define IXGBE_SUBDEV_ID_82599_LOM_SFP 0x8976#define IXGBE_DEV_ID_82599_SFP_EM 0x1507#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D#define IXGBE_DEV_ID_82599EN_SFP 0x1557
PATCH 2/2 ixgbe: check EEPROM for WOL support for X540 and above
This change aims to simplify the logic we use to determine WOL support by reading the EEPROM bits for MACs X540 and newer.
Also some cleanups in ixgbe_wol_supported() - changed return type to bool and removed redundant return variable by simply using return after the checks.
--- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 49 ++++++++++++------------- 2 files changed, 25 insertions(+), 28 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe.h +2 -2
@@ -895,8 +895,8 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *, struct ixgbe_ring *);void ixgbe_disable_rx_queue (struct ixgbe_adapter *adapter,struct ixgbe_ring *);void ixgbe_update_stats (struct ixgbe_adapter *adapter);int ixgbe_init_interrupt_scheme (struct ixgbe_adapter *adapter); -int ixgbe_wol_supported (struct ixgbe_adapter *adapter,u16 device_id, -u16 subdevice_id); +bool ixgbe_wol_supported (struct ixgbe_adapter *adapter,u16 device_id, +u16 subdevice_id);#ifdef CONFIG_PCI_IOV void ixgbe_full_sync_mac_table (struct ixgbe_adapter *adapter);#endif
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +23 -26
86 lines not on this page · raw message
Bowers
PATCH 2/2 ixgbe: check EEPROM for WOL support for X540 and above
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Thursday, April 21, 2016 11:37 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 2/2] ixgbe: check EEPROM for WOL support for X540 and aboveThis change aims to simplify the logic we use to determine WOL support by reading the EEPROM bits for MACs X540 and newer.
Also some cleanups in
ixgbe_wol_supported()- changed return type to bool and removed redundant return variable by simply using return after the checks.
Quoted 6 lines
Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 4 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 49 ++++++++++++--------- ---- 2 files changed, 25 insertions(+), 28 deletions(-)
Ethtool correctly reports WOL support
Bowers
PATCH 1/2 ixgbe: add WOL support for some 82599 subdevice IDs
In reply to Emil TantilovQuoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Emil Tantilov
Sent: Thursday, April 21, 2016 11:37 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH 1/2] ixgbe: add WOL support for some 82599 subdevice IDsWe had some 82599 subdevice IDs missing from the list of parts that support WOL.
Quoted 6 lines
Reported-by Neil Horman <[email protected]>Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 ++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-)
Patch applies and compiles correctly