]> Pileus Git - ~andy/linux/commitdiff
[TG3]: Do not try to access NIC_SRAM_DATA_SIG on Sun parts.
authorDavid S. Miller <davem@sunset.davemloft.net>
Tue, 14 Mar 2006 22:11:48 +0000 (14:11 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:14:27 +0000 (01:14 -0800)
Sun does't put an SEEPROM behind the tigon3 chip, among other things,
so accesses to these areas just give bus timeouts.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tg3.c

index caf4102b54ce6ed5afce495f503bf5e3ae2df963..31a16fa67558a246bad7403bc52945d3263d2ed3 100644 (file)
@@ -9097,6 +9097,10 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
        tp->phy_id = PHY_ID_INVALID;
        tp->led_ctrl = LED_CTRL_MODE_PHY_1;
 
+       /* Do not even try poking around in here on Sun parts.  */
+       if (tp->tg3_flags2 & TG3_FLG2_SUN_570X)
+               return;
+
        tg3_read_mem(tp, NIC_SRAM_DATA_SIG, &val);
        if (val == NIC_SRAM_DATA_SIG_MAGIC) {
                u32 nic_cfg, led_cfg;