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

Commit 6fdbab9d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by David S. Miller
Browse files

tg3: Fix failure to enable WoL by default when possible 



tg3 is supposed to enable WoL by default on adapters which support
that, but it fails to do so unless the adapter's
/sys/devices/.../power/wakeup file contains 'enabled' during the
initialization of the adapter.  Fix that by making tg3 use
device_set_wakeup_enable() to enable wakeup automatically whenever
WoL should be enabled by default.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41c31f31

drivers/net/tg3.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -12327,8 +12327,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) 
		if (val & VCPU_CFGSHDW_ASPM_DBNC)

		if (val & VCPU_CFGSHDW_ASPM_DBNC)

			tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;

			tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;

		if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&

		if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&

		    (val & VCPU_CFGSHDW_WOL_MAGPKT))

		    (val & VCPU_CFGSHDW_WOL_MAGPKT)) {

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;

			device_set_wakeup_enable(&tp->pdev->dev, true);

		}

		goto done;

		goto done;

	}

	}
@@ -12461,8 +12463,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) 
			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;

			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;





		if ((tp->tg3_flags & TG3_FLAG_WOL_CAP) &&

		if ((tp->tg3_flags & TG3_FLAG_WOL_CAP) &&

		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE))

		    (nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)) {

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;

			device_set_wakeup_enable(&tp->pdev->dev, true);

		}





		if (cfg2 & (1 << 17))

		if (cfg2 & (1 << 17))

			tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;

			tp->phy_flags |= TG3_PHYFLG_CAPACITIVE_COUPLING;