diff options
author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-07-21 03:58:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 15:33:56 -0400 |
commit | 8736c82650500222c031dd7f59f0126e59808e36 (patch) | |
tree | 408084aee5546fbb65e3343fbb2ab146dbc50315 /drivers/net/bnx2x/bnx2x_reg.h | |
parent | c03bd39c564f4b5d7683514e9249986e1404940d (diff) |
bnx2x: Parity errors recovery for 578xx
Fix the parity errors recovery flow for 578xx:
- Add a separate column for the 578xx in the parity mask
registers DB.
- Fix the bnx2x_process_kill_chip_reset() to handle the blocks
newly introduced in the 578xx.
Cover ATC and PGLUE_B blocks for 57712 and 578xx.
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_reg.h')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_reg.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_reg.h b/drivers/net/bnx2x/bnx2x_reg.h index 005c05af090..1e6784b7734 100644 --- a/drivers/net/bnx2x/bnx2x_reg.h +++ b/drivers/net/bnx2x/bnx2x_reg.h | |||
@@ -32,7 +32,11 @@ | |||
32 | /* [R 1] ATC initalization done */ | 32 | /* [R 1] ATC initalization done */ |
33 | #define ATC_REG_ATC_INIT_DONE 0x1100bc | 33 | #define ATC_REG_ATC_INIT_DONE 0x1100bc |
34 | /* [RC 6] Interrupt register #0 read clear */ | 34 | /* [RC 6] Interrupt register #0 read clear */ |
35 | #define ATC_REG_ATC_INT_STS_CLR 0x1101c0 | 35 | #define ATC_REG_ATC_INT_STS_CLR 0x1101c0 |
36 | /* [RW 5] Parity mask register #0 read/write */ | ||
37 | #define ATC_REG_ATC_PRTY_MASK 0x1101d8 | ||
38 | /* [RC 5] Parity register #0 read clear */ | ||
39 | #define ATC_REG_ATC_PRTY_STS_CLR 0x1101d0 | ||
36 | /* [RW 19] Interrupt mask register #0 read/write */ | 40 | /* [RW 19] Interrupt mask register #0 read/write */ |
37 | #define BRB1_REG_BRB1_INT_MASK 0x60128 | 41 | #define BRB1_REG_BRB1_INT_MASK 0x60128 |
38 | /* [R 19] Interrupt register #0 read */ | 42 | /* [R 19] Interrupt register #0 read */ |
@@ -2676,8 +2680,12 @@ | |||
2676 | #define PGLUE_B_REG_PGLUE_B_INT_STS 0x9298 | 2680 | #define PGLUE_B_REG_PGLUE_B_INT_STS 0x9298 |
2677 | /* [RC 9] Interrupt register #0 read clear */ | 2681 | /* [RC 9] Interrupt register #0 read clear */ |
2678 | #define PGLUE_B_REG_PGLUE_B_INT_STS_CLR 0x929c | 2682 | #define PGLUE_B_REG_PGLUE_B_INT_STS_CLR 0x929c |
2683 | /* [RW 2] Parity mask register #0 read/write */ | ||
2684 | #define PGLUE_B_REG_PGLUE_B_PRTY_MASK 0x92b4 | ||
2679 | /* [R 2] Parity register #0 read */ | 2685 | /* [R 2] Parity register #0 read */ |
2680 | #define PGLUE_B_REG_PGLUE_B_PRTY_STS 0x92a8 | 2686 | #define PGLUE_B_REG_PGLUE_B_PRTY_STS 0x92a8 |
2687 | /* [RC 2] Parity register #0 read clear */ | ||
2688 | #define PGLUE_B_REG_PGLUE_B_PRTY_STS_CLR 0x92ac | ||
2681 | /* [R 13] Details of first request received with error. [2:0] - PFID. [3] - | 2689 | /* [R 13] Details of first request received with error. [2:0] - PFID. [3] - |
2682 | * VF_VALID. [9:4] - VFID. [11:10] - Error Code - 0 - Indicates Completion | 2690 | * VF_VALID. [9:4] - VFID. [11:10] - Error Code - 0 - Indicates Completion |
2683 | * Timeout of a User Tx non-posted request. 1 - unsupported request. 2 - | 2691 | * Timeout of a User Tx non-posted request. 1 - unsupported request. 2 - |
@@ -5686,8 +5694,13 @@ | |||
5686 | #define MISC_REGISTERS_RESET_REG_2_CLEAR 0x598 | 5694 | #define MISC_REGISTERS_RESET_REG_2_CLEAR 0x598 |
5687 | #define MISC_REGISTERS_RESET_REG_2_MSTAT0 (0x1<<24) | 5695 | #define MISC_REGISTERS_RESET_REG_2_MSTAT0 (0x1<<24) |
5688 | #define MISC_REGISTERS_RESET_REG_2_MSTAT1 (0x1<<25) | 5696 | #define MISC_REGISTERS_RESET_REG_2_MSTAT1 (0x1<<25) |
5697 | #define MISC_REGISTERS_RESET_REG_2_PGLC (0x1<<19) | ||
5698 | #define MISC_REGISTERS_RESET_REG_2_RST_ATC (0x1<<17) | ||
5689 | #define MISC_REGISTERS_RESET_REG_2_RST_BMAC0 (0x1<<0) | 5699 | #define MISC_REGISTERS_RESET_REG_2_RST_BMAC0 (0x1<<0) |
5700 | #define MISC_REGISTERS_RESET_REG_2_RST_BMAC1 (0x1<<1) | ||
5701 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC0 (0x1<<2) | ||
5690 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE (0x1<<14) | 5702 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC0_HARD_CORE (0x1<<14) |
5703 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC1 (0x1<<3) | ||
5691 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC1_HARD_CORE (0x1<<15) | 5704 | #define MISC_REGISTERS_RESET_REG_2_RST_EMAC1_HARD_CORE (0x1<<15) |
5692 | #define MISC_REGISTERS_RESET_REG_2_RST_GRC (0x1<<4) | 5705 | #define MISC_REGISTERS_RESET_REG_2_RST_GRC (0x1<<4) |
5693 | #define MISC_REGISTERS_RESET_REG_2_RST_MCP_N_HARD_CORE_RST_B (0x1<<6) | 5706 | #define MISC_REGISTERS_RESET_REG_2_RST_MCP_N_HARD_CORE_RST_B (0x1<<6) |
@@ -5700,6 +5713,7 @@ | |||
5700 | #define MISC_REGISTERS_RESET_REG_2_RST_RBCN (0x1<<9) | 5713 | #define MISC_REGISTERS_RESET_REG_2_RST_RBCN (0x1<<9) |
5701 | #define MISC_REGISTERS_RESET_REG_2_SET 0x594 | 5714 | #define MISC_REGISTERS_RESET_REG_2_SET 0x594 |
5702 | #define MISC_REGISTERS_RESET_REG_2_UMAC0 (0x1<<20) | 5715 | #define MISC_REGISTERS_RESET_REG_2_UMAC0 (0x1<<20) |
5716 | #define MISC_REGISTERS_RESET_REG_2_UMAC1 (0x1<<21) | ||
5703 | #define MISC_REGISTERS_RESET_REG_2_XMAC (0x1<<22) | 5717 | #define MISC_REGISTERS_RESET_REG_2_XMAC (0x1<<22) |
5704 | #define MISC_REGISTERS_RESET_REG_2_XMAC_SOFT (0x1<<23) | 5718 | #define MISC_REGISTERS_RESET_REG_2_XMAC_SOFT (0x1<<23) |
5705 | #define MISC_REGISTERS_RESET_REG_3_CLEAR 0x5a8 | 5719 | #define MISC_REGISTERS_RESET_REG_3_CLEAR 0x5a8 |