Skip to contentSkip to conversation

tg3: Do not enable APE on bcm5700

PATCH Applied Matt Carlson 2 participants 2 messages Nov 3, 2008 – Nov 4, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Matt Carlson

author
#0 lore raw

PATCH 6/15 tg3: Do not enable APE on bcm5700

With older versions of the NVRAM format, the driver may mistakenly determine that APE is enabled. Make sure this doesn't happen by restricting the ENABLE_APE check to devices known to have more recent NVRAM image formats.

Signed-off-by Matt Carlson <[email protected]>
Signed-off-by Michael Chan <[email protected]>
---
 drivers/net/tg3.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/net/tg3.c +4 -1
index 45fcbc3..978d1f0 100644
@@ -11441,8 +11441,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 			if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
 				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
 		}
-		if (nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE)
+
+		if ((nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE) &&
+			(tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
 			tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE;
+
 		if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
 		    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
 			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;
Signature · 1 line
1.5.6.4