diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2007-11-13 00:10:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2007-11-13 00:10:58 -0500 |
commit | a5767dec1980463aef5614b7ad8a800bb4f4c353 (patch) | |
tree | be204ff73acbaf61f0f95e4530fdc0ff615943c6 /drivers/net/tg3.h | |
parent | 9acb961e7d780291659bf950b3b718ff9e085620 (diff) |
[TG3]: Fix nvram selftest failures
Newer devices contain bootcode in the chip's private ROM area. This
bootcode is called selfboot. Selfboot can be patched in the device's
NVRAM and the patches can have several formats. In one particular
format, the checksum calculation needs to be slightly modified. This
patch adjusts the NVRAM test code for that case, and add support for the
missing formats.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index c6aad49a375d..f715b35dfd54 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -1555,6 +1555,12 @@ | |||
1555 | #define TG3_EEPROM_MAGIC 0x669955aa | 1555 | #define TG3_EEPROM_MAGIC 0x669955aa |
1556 | #define TG3_EEPROM_MAGIC_FW 0xa5000000 | 1556 | #define TG3_EEPROM_MAGIC_FW 0xa5000000 |
1557 | #define TG3_EEPROM_MAGIC_FW_MSK 0xff000000 | 1557 | #define TG3_EEPROM_MAGIC_FW_MSK 0xff000000 |
1558 | #define TG3_EEPROM_SB_FORMAT_MASK 0x00e00000 | ||
1559 | #define TG3_EEPROM_SB_FORMAT_1 0x00200000 | ||
1560 | #define TG3_EEPROM_SB_REVISION_MASK 0x001f0000 | ||
1561 | #define TG3_EEPROM_SB_REVISION_0 0x00000000 | ||
1562 | #define TG3_EEPROM_SB_REVISION_2 0x00020000 | ||
1563 | #define TG3_EEPROM_SB_REVISION_3 0x00030000 | ||
1558 | #define TG3_EEPROM_MAGIC_HW 0xabcd | 1564 | #define TG3_EEPROM_MAGIC_HW 0xabcd |
1559 | #define TG3_EEPROM_MAGIC_HW_MSK 0xffff | 1565 | #define TG3_EEPROM_MAGIC_HW_MSK 0xffff |
1560 | 1566 | ||
@@ -1765,6 +1771,8 @@ | |||
1765 | /* APE convenience enumerations. */ | 1771 | /* APE convenience enumerations. */ |
1766 | #define TG3_APE_LOCK_MEM 4 | 1772 | #define TG3_APE_LOCK_MEM 4 |
1767 | 1773 | ||
1774 | #define TG3_EEPROM_SB_F1R2_MBA_OFF 0x10 | ||
1775 | |||
1768 | 1776 | ||
1769 | /* There are two ways to manage the TX descriptors on the tigon3. | 1777 | /* There are two ways to manage the TX descriptors on the tigon3. |
1770 | * Either the descriptors are in host DMA'able memory, or they | 1778 | * Either the descriptors are in host DMA'able memory, or they |