diff options
| author | Michael Chan <mchan@broadcom.com> | 2013-02-14 12:13:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-15 14:02:59 -0500 |
| commit | c5d0b72e641340c5dc915cdfab5e2c55d81425c2 (patch) | |
| tree | 2630d7f3038f526128981a37fef0004a42df7c60 | |
| parent | d240d210f5a9254d4df395d65f1ed3b2b45bc298 (diff) | |
| download | linux-3.10-c5d0b72e641340c5dc915cdfab5e2c55d81425c2.tar.gz linux-3.10-c5d0b72e641340c5dc915cdfab5e2c55d81425c2.tar.bz2 linux-3.10-c5d0b72e641340c5dc915cdfab5e2c55d81425c2.zip | |
tg3: Fix 5762 NVRAM sizing
Don't set the default size to 128K if it is 5762. Instead, rely on the
size we obtain from NVRAM location 0xf0.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 3004d69596c..7ac0bd00873 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -13883,7 +13883,8 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp) tp->nvram_size = TG3_NVRAM_SIZE_1MB; break; default: - tp->nvram_size = TG3_NVRAM_SIZE_128KB; + if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762) + tp->nvram_size = TG3_NVRAM_SIZE_128KB; break; } break; @@ -13929,7 +13930,8 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp) tp->nvram_size = TG3_NVRAM_SIZE_1MB; break; default: - tp->nvram_size = TG3_NVRAM_SIZE_128KB; + if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762) + tp->nvram_size = TG3_NVRAM_SIZE_128KB; break; } break; |