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

Commit 0527ba35 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

[TG3]: WOL defaults 



This patch enables WOL by default if out-of-box WOL is enabled in the
NVRAM.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9936bcf6

drivers/net/tg3.c

+9 −6
Original line number Diff line number Diff line
@@ -10412,8 +10412,12 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) 
			tp->tg3_flags &= ~TG3_FLAG_EEPROM_WRITE_PROT;

			tp->tg3_flags2 |= TG3_FLG2_IS_NIC;

		}

		if (tr32(VCPU_CFGSHDW) & VCPU_CFGSHDW_ASPM_DBNC)

		val = tr32(VCPU_CFGSHDW);

		if (val & VCPU_CFGSHDW_ASPM_DBNC)

			tp->tg3_flags |= TG3_FLAG_ASPM_WORKAROUND;

		if ((val & VCPU_CFGSHDW_WOL_ENABLE) &&

		    (val & VCPU_CFGSHDW_WOL_MAGPKT))

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;

		return;

	}
@@ -10536,6 +10540,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) 
		    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))

			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;



		if (tp->tg3_flags & TG3_FLAG_WOL_CAP &&

		    nic_cfg & NIC_SRAM_DATA_CFG_WOL_ENABLE)

			tp->tg3_flags |= TG3_FLAG_WOL_ENABLE;



		if (cfg2 & (1 << 17))

			tp->tg3_flags2 |= TG3_FLG2_CAPACITIVE_COUPLING;
@@ -11454,11 +11462,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755)

		tp->rx_std_max_post = 8;



	/* By default, disable wake-on-lan.  User can change this

	 * using ETHTOOL_SWOL.

	 */

	tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;



	if (tp->tg3_flags & TG3_FLAG_ASPM_WORKAROUND)

		tp->pwrmgmt_thresh = tr32(PCIE_PWR_MGMT_THRESH) &

				     PCIE_PWR_MGMT_L1_THRESH_MSK;

drivers/net/tg3.h

+2 −0
Original line number Diff line number Diff line
@@ -1151,6 +1151,8 @@ 
#define  VCPU_STATUS_DRV_RESET		 0x08000000



#define VCPU_CFGSHDW			0x00005104

#define  VCPU_CFGSHDW_WOL_ENABLE	 0x00000001

#define  VCPU_CFGSHDW_WOL_MAGPKT	 0x00000004

#define  VCPU_CFGSHDW_ASPM_DBNC		 0x00001000



/* Mailboxes */