* [PATCH 06/15] tg3: Do not enable APE on bcm5700
@ 2008-11-03 10:12 Matt Carlson
2008-11-04 0:52 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Matt Carlson @ 2008-11-03 10:12 UTC (permalink / raw)
To: davem; +Cc: netdev, Michael Chan, andy
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 <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
---
drivers/net/tg3.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 45fcbc3..978d1f0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -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;
--
1.5.6.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 06/15] tg3: Do not enable APE on bcm5700
2008-11-03 10:12 [PATCH 06/15] tg3: Do not enable APE on bcm5700 Matt Carlson
@ 2008-11-04 0:52 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-11-04 0:52 UTC (permalink / raw)
To: mcarlson; +Cc: netdev, mchan, andy
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Mon, 3 Nov 2008 02:12:05 -0800
> 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 <mcarlson@broadcom.com>
> Signed-off-by: Michael Chan <mchan@broadcom.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-04 0:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-03 10:12 [PATCH 06/15] tg3: Do not enable APE on bcm5700 Matt Carlson
2008-11-04 0:52 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).