diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-08-02 07:26:00 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-02 18:46:29 -0400 |
commit | 8c69b1e702527e39c0b4fbda79d2738d186a3908 (patch) | |
tree | 662772644a446b20766496f8c741c84143480c5c /drivers/net | |
parent | f37500d3f66ba82888315838278d56fc27308327 (diff) |
tg3: Restrict ASPM workaround devlist
The ASPM workaround setting obtained from NVRAM only works with devices
older than 5717. This patch enforces the restriction.
Reviewed-by: Benjamin Li <benli@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 38979f24e541..7c2c81ab4838 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -12188,7 +12188,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) | |||
12188 | (cfg2 & NIC_SRAM_DATA_CFG_2_APD_EN)) | 12188 | (cfg2 & NIC_SRAM_DATA_CFG_2_APD_EN)) |
12189 | tp->tg3_flags3 |= TG3_FLG3_PHY_ENABLE_APD; | 12189 | tp->tg3_flags3 |= TG3_FLG3_PHY_ENABLE_APD; |
12190 | 12190 | ||
12191 | if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) { | 12191 | if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) && |
12192 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 && | ||
12193 | !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) { | ||
12192 | u32 cfg3; | 12194 | u32 cfg3; |
12193 | 12195 | ||
12194 | tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3); | 12196 | tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3); |