summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2013-02-14 07:13:40 -0500
committerDavid S. Miller <davem@davemloft.net>2013-02-15 14:02:59 -0500
commitc5d0b72e641340c5dc915cdfab5e2c55d81425c2 (patch)
tree2630d7f3038f526128981a37fef0004a42df7c60
parentd240d210f5a9254d4df395d65f1ed3b2b45bc298 (diff)
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 3004d69596c3..7ac0bd008738 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)
13883 tp->nvram_size = TG3_NVRAM_SIZE_1MB; 13883 tp->nvram_size = TG3_NVRAM_SIZE_1MB;
13884 break; 13884 break;
13885 default: 13885 default:
13886 tp->nvram_size = TG3_NVRAM_SIZE_128KB; 13886 if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762)
13887 tp->nvram_size = TG3_NVRAM_SIZE_128KB;
13887 break; 13888 break;
13888 } 13889 }
13889 break; 13890 break;
@@ -13929,7 +13930,8 @@ static void tg3_get_5720_nvram_info(struct tg3 *tp)
13929 tp->nvram_size = TG3_NVRAM_SIZE_1MB; 13930 tp->nvram_size = TG3_NVRAM_SIZE_1MB;
13930 break; 13931 break;
13931 default: 13932 default:
13932 tp->nvram_size = TG3_NVRAM_SIZE_128KB; 13933 if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5762)
13934 tp->nvram_size = TG3_NVRAM_SIZE_128KB;
13933 break; 13935 break;
13934 } 13936 }
13935 break; 13937 break;