diff options
author | Michael Chan <mchan@broadcom.com> | 2006-03-21 01:28:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-21 01:28:57 -0500 |
commit | 79f4d13a15774c2d442b619bad95a4c612eed4f3 (patch) | |
tree | 22996b2b33bc68d24ec8091954d8d6f57a552eb4 | |
parent | fcfa0a32c767219c1bdad621ef4a3aff1904cbbd (diff) |
[TG3]: Fixup memory test for 5787
Ethtool memory test on 5787 requires a new memory table.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 40f52897cf9b..fe5c565a5284 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -8306,14 +8306,24 @@ static int tg3_test_memory(struct tg3 *tp) | |||
8306 | { 0x00008000, 0x02000}, | 8306 | { 0x00008000, 0x02000}, |
8307 | { 0x00010000, 0x0e000}, | 8307 | { 0x00010000, 0x0e000}, |
8308 | { 0xffffffff, 0x00000} | 8308 | { 0xffffffff, 0x00000} |
8309 | }, mem_tbl_5755[] = { | ||
8310 | { 0x00000200, 0x00008}, | ||
8311 | { 0x00004000, 0x00800}, | ||
8312 | { 0x00006000, 0x00800}, | ||
8313 | { 0x00008000, 0x02000}, | ||
8314 | { 0x00010000, 0x0c000}, | ||
8315 | { 0xffffffff, 0x00000} | ||
8309 | }; | 8316 | }; |
8310 | struct mem_entry *mem_tbl; | 8317 | struct mem_entry *mem_tbl; |
8311 | int err = 0; | 8318 | int err = 0; |
8312 | int i; | 8319 | int i; |
8313 | 8320 | ||
8314 | if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) | 8321 | if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) { |
8315 | mem_tbl = mem_tbl_5705; | 8322 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) |
8316 | else | 8323 | mem_tbl = mem_tbl_5755; |
8324 | else | ||
8325 | mem_tbl = mem_tbl_5705; | ||
8326 | } else | ||
8317 | mem_tbl = mem_tbl_570x; | 8327 | mem_tbl = mem_tbl_570x; |
8318 | 8328 | ||
8319 | for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) { | 8329 | for (i = 0; mem_tbl[i].offset != 0xffffffff; i++) { |