Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63d4a8f9 authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher
Browse files

igb: No longer rely on APME to determine WoL settings 



Historically, we've been using the APME bit to determine whether a device
supports wake on a given port or not. However, this bit specifies the
default wake setting, rather than the wake support. Change the behavior so
that we use a flag to keep the capabilities separate from the enablement
while meeting customer requirements.

Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3e961a06

drivers/net/ethernet/intel/igb/igb.h

+1 −2
Original line number Diff line number Diff line
@@ -370,8 +370,6 @@ struct igb_adapter { 
	u32 eims_other;



	/* to not mess up cache alignment, always add to the bottom */

	u32 eeprom_wol;



	u16 tx_ring_count;

	u16 rx_ring_count;

	unsigned int vfs_allocated_count;
@@ -401,6 +399,7 @@ struct igb_adapter { 
#define IGB_FLAG_PTP			(1 << 5)

#define IGB_FLAG_RSS_FIELD_IPV4_UDP	(1 << 6)

#define IGB_FLAG_RSS_FIELD_IPV6_UDP	(1 << 7)

#define IGB_FLAG_WOL_SUPPORTED		(1 << 8)



/* DMA Coalescing defines */

#define IGB_MIN_TXPBSIZE           20408

drivers/net/ethernet/intel/igb/igb_ethtool.c

+2 −54
Original line number Diff line number Diff line
@@ -1966,54 +1966,6 @@ static void igb_diag_test(struct net_device *netdev, 
	msleep_interruptible(4 * 1000);

}



static int igb_wol_exclusion(struct igb_adapter *adapter,

			     struct ethtool_wolinfo *wol)

{

	struct e1000_hw *hw = &adapter->hw;

	int retval = 1; /* fail by default */



	switch (hw->device_id) {

	case E1000_DEV_ID_82575GB_QUAD_COPPER:

		/* WoL not supported */

		wol->supported = 0;

		break;

	case E1000_DEV_ID_82575EB_FIBER_SERDES:

	case E1000_DEV_ID_82576_FIBER:

	case E1000_DEV_ID_82576_SERDES:

		/* Wake events not supported on port B */

		if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1) {

			wol->supported = 0;

			break;

		}

		/* return success for non excluded adapter ports */

		retval = 0;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* quad port adapters only support WoL on port A */

		if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {

			wol->supported = 0;

			break;

		}

		/* return success for non excluded adapter ports */

		retval = 0;

		break;

	default:

		/* dual port cards only support WoL on port A from now on

		 * unless it was enabled in the eeprom for port B

		 * so exclude FUNC_1 ports from having WoL enabled */

		if ((rd32(E1000_STATUS) & E1000_STATUS_FUNC_MASK) &&

		    !adapter->eeprom_wol) {

			wol->supported = 0;

			break;

		}



		retval = 0;

	}



	return retval;

}



static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)

{

	struct igb_adapter *adapter = netdev_priv(netdev);
@@ -2023,10 +1975,7 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	                 WAKE_PHY;

	wol->wolopts = 0;



	/* this function will set ->supported = 0 and return 1 if wol is not

	 * supported by this hardware */

	if (igb_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

	if (!(adapter->flags & IGB_FLAG_WOL_SUPPORTED))

		return;



	/* apply any specific unsupported masks here */
@@ -2054,8 +2003,7 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE))

		return -EOPNOTSUPP;



	if (igb_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

	if (!(adapter->flags & IGB_FLAG_WOL_SUPPORTED))

		return wol->wolopts ? -EOPNOTSUPP : 0;



	/* these settings will always override what we currently have */

drivers/net/ethernet/intel/igb/igb_main.c

+26 −14
Original line number Diff line number Diff line
@@ -1837,7 +1837,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
	const struct e1000_info *ei = igb_info_tbl[ent->driver_data];

	unsigned long mmio_start, mmio_len;

	int err, pci_using_dac;

	u16 eeprom_apme_mask = IGB_EEPROM_APME;

	u8 part_str[E1000_PBANUM_LENGTH];



	/* Catch broken hardware that put the wrong VF device ID in
@@ -2045,28 +2044,27 @@ static int __devinit igb_probe(struct pci_dev *pdev, 


	igb_validate_mdi_setting(hw);



	/* Initial Wake on LAN setting If APM wake is enabled in the EEPROM,

	 * enable the ACPI Magic Packet filter

	 */



	/* By default, support wake on port A */

	if (hw->bus.func == 0)

		hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);

	else if (hw->mac.type >= e1000_82580)

		adapter->flags |= IGB_FLAG_WOL_SUPPORTED;



	/* Check the NVM for wake support on non-port A ports */

	if (hw->mac.type >= e1000_82580)

		hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A +

		                 NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1,

		                 &eeprom_data);

	else if (hw->bus.func == 1)

		hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_B, 1, &eeprom_data);



	if (eeprom_data & eeprom_apme_mask)

		adapter->eeprom_wol |= E1000_WUFC_MAG;

	if (eeprom_data & IGB_EEPROM_APME)

		adapter->flags |= IGB_FLAG_WOL_SUPPORTED;



	/* now that we have the eeprom settings, apply the special cases where

	 * the eeprom may be wrong or the board simply won't support wake on

	 * lan on a particular port */

	switch (pdev->device) {

	case E1000_DEV_ID_82575GB_QUAD_COPPER:

		adapter->eeprom_wol = 0;

		adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;

		break;

	case E1000_DEV_ID_82575EB_FIBER_SERDES:

	case E1000_DEV_ID_82576_FIBER:
@@ -2074,24 +2072,38 @@ static int __devinit igb_probe(struct pci_dev *pdev, 
		/* Wake events only supported on port A for dual fiber

		 * regardless of eeprom setting */

		if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)

			adapter->eeprom_wol = 0;

			adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;

		break;

	case E1000_DEV_ID_82576_QUAD_COPPER:

	case E1000_DEV_ID_82576_QUAD_COPPER_ET2:

		/* if quad port adapter, disable WoL on all but port A */

		if (global_quad_port_a != 0)

			adapter->eeprom_wol = 0;

			adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;

		else

			adapter->flags |= IGB_FLAG_QUAD_PORT_A;

		/* Reset for multiple quad port adapters */

		if (++global_quad_port_a == 4)

			global_quad_port_a = 0;

		break;

	default:

		/* If the device can't wake, don't set software support */

		if (!device_can_wakeup(&adapter->pdev->dev))

			adapter->flags &= ~IGB_FLAG_WOL_SUPPORTED;

	}



	/* initialize the wol settings based on the eeprom settings */

	adapter->wol = adapter->eeprom_wol;

	device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);

	if (adapter->flags & IGB_FLAG_WOL_SUPPORTED)

		adapter->wol |= E1000_WUFC_MAG;



	/* Some vendors want WoL disabled by default, but still supported */

	if ((hw->mac.type == e1000_i350) &&

	    (pdev->subsystem_vendor == PCI_VENDOR_ID_HP)) {

		adapter->flags |= IGB_FLAG_WOL_SUPPORTED;

		adapter->wol = 0;

	}



	device_set_wakeup_enable(&adapter->pdev->dev,

				 adapter->flags & IGB_FLAG_WOL_SUPPORTED);



	/* reset the hardware with the new settings */

	igb_reset(adapter);