Skip to content

L
linux
Commit 4440c6f7 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'bnx2x' 

Yuval Mintz says:

====================
bnx2x: Bug fixes patch series

This patch series contains fixes for various flows - several SR-IOV issues
are fixed, ethtool callbacks (coalescing and register dump) are corrected,
null pointer dereference on error flows is prevented, etc.

Changes from V1
---------------
 - Patch 2  "bnx2x: Prevent an illegal pointer dereference during panic"
   is revised, with improved handling of edge cases.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 49595b7b edd31476
Hide whitespace changes
Inline Side-by-side
Showing with 268 additions and 246 deletions
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
View file @ 4440c6f7
...@@ -1197,8 +1197,9 @@ union cdu_context { ...@@ -1197,8 +1197,9 @@ union cdu_context {
/* TM (timers) host DB constants */ /* TM (timers) host DB constants */
#define TM_ILT_PAGE_SZ_HW 0 #define TM_ILT_PAGE_SZ_HW 0
#define TM_ILT_PAGE_SZ (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */ #define TM_ILT_PAGE_SZ (4096 << TM_ILT_PAGE_SZ_HW) /* 4K */
/* #define TM_CONN_NUM (CNIC_STARTING_CID+CNIC_ISCSI_CXT_MAX) */ #define TM_CONN_NUM (BNX2X_FIRST_VF_CID + \
#define TM_CONN_NUM 1024 BNX2X_VF_CIDS + \
CNIC_ISCSI_CID_MAX)
#define TM_ILT_SZ (8 * TM_CONN_NUM) #define TM_ILT_SZ (8 * TM_CONN_NUM)
#define TM_ILT_LINES DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ) #define TM_ILT_LINES DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ)
...@@ -1527,7 +1528,6 @@ struct bnx2x { ...@@ -1527,7 +1528,6 @@ struct bnx2x {
#define PCI_32BIT_FLAG (1 << 1) #define PCI_32BIT_FLAG (1 << 1)
#define ONE_PORT_FLAG (1 << 2) #define ONE_PORT_FLAG (1 << 2)
#define NO_WOL_FLAG (1 << 3) #define NO_WOL_FLAG (1 << 3)
#define USING_DAC_FLAG (1 << 4)
#define USING_MSIX_FLAG (1 << 5) #define USING_MSIX_FLAG (1 << 5)
#define USING_MSI_FLAG (1 << 6) #define USING_MSI_FLAG (1 << 6)
#define DISABLE_MSI_FLAG (1 << 7) #define DISABLE_MSI_FLAG (1 << 7)
...@@ -1621,7 +1621,7 @@ struct bnx2x { ...@@ -1621,7 +1621,7 @@ struct bnx2x {
u16 rx_ticks_int; u16 rx_ticks_int;
u16 rx_ticks; u16 rx_ticks;
/* Maximal coalescing timeout in us */ /* Maximal coalescing timeout in us */
#define BNX2X_MAX_COALESCE_TOUT (0xf0*12) #define BNX2X_MAX_COALESCE_TOUT (0xff*BNX2X_BTR)
u32 lin_cnt; u32 lin_cnt;
...@@ -2072,7 +2072,8 @@ u32 bnx2x_dmae_opcode(struct bnx2x *bp, u8 src_type, u8 dst_type, ...@@ -2072,7 +2072,8 @@ u32 bnx2x_dmae_opcode(struct bnx2x *bp, u8 src_type, u8 dst_type,
void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae, void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
u8 src_type, u8 dst_type); u8 src_type, u8 dst_type);
int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae); int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
u32 *comp);
/* FLR related routines */ /* FLR related routines */
u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp); u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp);
...@@ -2498,4 +2499,8 @@ enum bnx2x_pci_bus_speed { ...@@ -2498,4 +2499,8 @@ enum bnx2x_pci_bus_speed {
}; };
void bnx2x_set_local_cmng(struct bnx2x *bp); void bnx2x_set_local_cmng(struct bnx2x *bp);
#define MCPR_SCRATCH_BASE(bp) \
(CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)
#endif /* bnx2x.h */ #endif /* bnx2x.h */
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
View file @ 4440c6f7
...@@ -891,17 +891,8 @@ static void bnx2x_get_regs(struct net_device *dev, ...@@ -891,17 +891,8 @@ static void bnx2x_get_regs(struct net_device *dev,
* will re-enable parity attentions right after the dump. * will re-enable parity attentions right after the dump.
*/ */
/* Disable parity on path 0 */
bnx2x_pretend_func(bp, 0);
bnx2x_disable_blocks_parity(bp); bnx2x_disable_blocks_parity(bp);
/* Disable parity on path 1 */
bnx2x_pretend_func(bp, 1);
bnx2x_disable_blocks_parity(bp);
/* Return to current function */
bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
dump_hdr.preset = DUMP_ALL_PRESETS; dump_hdr.preset = DUMP_ALL_PRESETS;
dump_hdr.version = BNX2X_DUMP_VERSION; dump_hdr.version = BNX2X_DUMP_VERSION;
...@@ -928,18 +919,9 @@ static void bnx2x_get_regs(struct net_device *dev, ...@@ -928,18 +919,9 @@ static void bnx2x_get_regs(struct net_device *dev,
/* Actually read the registers */ /* Actually read the registers */
__bnx2x_get_regs(bp, p); __bnx2x_get_regs(bp, p);
/* Re-enable parity attentions on path 0 */ /* Re-enable parity attentions */
bnx2x_pretend_func(bp, 0);
bnx2x_clear_blocks_parity(bp); bnx2x_clear_blocks_parity(bp);
bnx2x_enable_blocks_parity(bp); bnx2x_enable_blocks_parity(bp);
/* Re-enable parity attentions on path 1 */
bnx2x_pretend_func(bp, 1);
bnx2x_clear_blocks_parity(bp);
bnx2x_enable_blocks_parity(bp);
/* Return to current function */
bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
} }
static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset) static int bnx2x_get_preset_regs_len(struct net_device *dev, u32 preset)
...@@ -993,17 +975,8 @@ static int bnx2x_get_dump_data(struct net_device *dev, ...@@ -993,17 +975,8 @@ static int bnx2x_get_dump_data(struct net_device *dev,
* will re-enable parity attentions right after the dump. * will re-enable parity attentions right after the dump.
*/ */
/* Disable parity on path 0 */
bnx2x_pretend_func(bp, 0);
bnx2x_disable_blocks_parity(bp); bnx2x_disable_blocks_parity(bp);
/* Disable parity on path 1 */
bnx2x_pretend_func(bp, 1);
bnx2x_disable_blocks_parity(bp);
/* Return to current function */
bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1; dump_hdr.header_size = (sizeof(struct dump_header) / 4) - 1;
dump_hdr.preset = bp->dump_preset_idx; dump_hdr.preset = bp->dump_preset_idx;
dump_hdr.version = BNX2X_DUMP_VERSION; dump_hdr.version = BNX2X_DUMP_VERSION;
...@@ -1032,19 +1005,10 @@ static int bnx2x_get_dump_data(struct net_device *dev, ...@@ -1032,19 +1005,10 @@ static int bnx2x_get_dump_data(struct net_device *dev,
/* Actually read the registers */ /* Actually read the registers */
__bnx2x_get_preset_regs(bp, p, dump_hdr.preset); __bnx2x_get_preset_regs(bp, p, dump_hdr.preset);
/* Re-enable parity attentions on path 0 */ /* Re-enable parity attentions */
bnx2x_pretend_func(bp, 0);
bnx2x_clear_blocks_parity(bp); bnx2x_clear_blocks_parity(bp);
bnx2x_enable_blocks_parity(bp); bnx2x_enable_blocks_parity(bp);
/* Re-enable parity attentions on path 1 */
bnx2x_pretend_func(bp, 1);
bnx2x_clear_blocks_parity(bp);
bnx2x_enable_blocks_parity(bp);
/* Return to current function */
bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
return 0; return 0;
} }
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
View file @ 4440c6f7
...@@ -640,23 +640,35 @@ static const struct { ...@@ -640,23 +640,35 @@ static const struct {
* [30] MCP Latched ump_tx_parity * [30] MCP Latched ump_tx_parity
* [31] MCP Latched scpad_parity * [31] MCP Latched scpad_parity
*/ */
#define MISC_AEU_ENABLE_MCP_PRTY_BITS \ #define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS \
(AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \ (AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \ AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \ AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY)
#define MISC_AEU_ENABLE_MCP_PRTY_BITS \
(MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \
AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY) AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
/* Below registers control the MCP parity attention output. When /* Below registers control the MCP parity attention output. When
* MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are
* enabled, when cleared - disabled. * enabled, when cleared - disabled.
*/ */
static const u32 mcp_attn_ctl_regs[] = { static const struct {
MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0, u32 addr;
MISC_REG_AEU_ENABLE4_NIG_0, u32 bits;
MISC_REG_AEU_ENABLE4_PXP_0, } mcp_attn_ctl_regs[] = {
MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0, { MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
MISC_REG_AEU_ENABLE4_NIG_1, MISC_AEU_ENABLE_MCP_PRTY_BITS },
MISC_REG_AEU_ENABLE4_PXP_1 { MISC_REG_AEU_ENABLE4_NIG_0,
MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
{ MISC_REG_AEU_ENABLE4_PXP_0,
MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
{ MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
MISC_AEU_ENABLE_MCP_PRTY_BITS },
{ MISC_REG_AEU_ENABLE4_NIG_1,
MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
{ MISC_REG_AEU_ENABLE4_PXP_1,
MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }
}; };
static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable)
...@@ -665,14 +677,14 @@ static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) ...@@ -665,14 +677,14 @@ static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable)
u32 reg_val; u32 reg_val;
for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) { for (i = 0; i < ARRAY_SIZE(mcp_attn_ctl_regs); i++) {
reg_val = REG_RD(bp, mcp_attn_ctl_regs[i]); reg_val = REG_RD(bp, mcp_attn_ctl_regs[i].addr);
if (enable) if (enable)
reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS; reg_val |= mcp_attn_ctl_regs[i].bits;
else else
reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS; reg_val &= ~mcp_attn_ctl_regs[i].bits;
REG_WR(bp, mcp_attn_ctl_regs[i], reg_val); REG_WR(bp, mcp_attn_ctl_regs[i].addr, reg_val);
} }
} }
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View file @ 4440c6f7
...@@ -503,9 +503,9 @@ void bnx2x_prep_dmae_with_comp(struct bnx2x *bp, ...@@ -503,9 +503,9 @@ void bnx2x_prep_dmae_with_comp(struct bnx2x *bp,
} }
/* issue a dmae command over the init-channel and wait for completion */ /* issue a dmae command over the init-channel and wait for completion */
int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae,
u32 *comp)
{ {
u32 *wb_comp = bnx2x_sp(bp, wb_comp);
int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000; int cnt = CHIP_REV_IS_SLOW(bp) ? (400000) : 4000;
int rc = 0; int rc = 0;
...@@ -518,14 +518,14 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) ...@@ -518,14 +518,14 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae)
spin_lock_bh(&bp->dmae_lock); spin_lock_bh(&bp->dmae_lock);
/* reset completion */ /* reset completion */
*wb_comp = 0; *comp = 0;
/* post the command on the channel used for initializations */ /* post the command on the channel used for initializations */
bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp)); bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp));
/* wait for completion */ /* wait for completion */
udelay(5); udelay(5);
while ((*wb_comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) { while ((*comp & ~DMAE_PCI_ERR_FLAG) != DMAE_COMP_VAL) {
if (!cnt || if (!cnt ||
(bp->recovery_state != BNX2X_RECOVERY_DONE && (bp->recovery_state != BNX2X_RECOVERY_DONE &&
...@@ -537,7 +537,7 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae) ...@@ -537,7 +537,7 @@ int bnx2x_issue_dmae_with_comp(struct bnx2x *bp, struct dmae_command *dmae)
cnt--; cnt--;
udelay(50); udelay(50);
} }
if (*wb_comp & DMAE_PCI_ERR_FLAG) { if (*comp & DMAE_PCI_ERR_FLAG) {
BNX2X_ERR("DMAE PCI error!\n"); BNX2X_ERR("DMAE PCI error!\n");
rc = DMAE_PCI_ERROR; rc = DMAE_PCI_ERROR;
} }
...@@ -574,7 +574,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr, ...@@ -574,7 +574,7 @@ void bnx2x_write_dmae(struct bnx2x *bp, dma_addr_t dma_addr, u32 dst_addr,
dmae.len = len32; dmae.len = len32;
/* issue the command and wait for completion */ /* issue the command and wait for completion */
rc = bnx2x_issue_dmae_with_comp(bp, &dmae); rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
if (rc) { if (rc) {
BNX2X_ERR("DMAE returned failure %d\n", rc); BNX2X_ERR("DMAE returned failure %d\n", rc);
bnx2x_panic(); bnx2x_panic();
...@@ -611,7 +611,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32) ...@@ -611,7 +611,7 @@ void bnx2x_read_dmae(struct bnx2x *bp, u32 src_addr, u32 len32)
dmae.len = len32; dmae.len = len32;
/* issue the command and wait for completion */ /* issue the command and wait for completion */
rc = bnx2x_issue_dmae_with_comp(bp, &dmae); rc = bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
if (rc) { if (rc) {
BNX2X_ERR("DMAE returned failure %d\n", rc); BNX2X_ERR("DMAE returned failure %d\n", rc);
bnx2x_panic(); bnx2x_panic();
...@@ -751,6 +751,10 @@ static int bnx2x_mc_assert(struct bnx2x *bp) ...@@ -751,6 +751,10 @@ static int bnx2x_mc_assert(struct bnx2x *bp)
return rc; return rc;
} }
#define MCPR_TRACE_BUFFER_SIZE (0x800)
#define SCRATCH_BUFFER_SIZE(bp) \
(CHIP_IS_E1(bp) ? 0x10000 : (CHIP_IS_E1H(bp) ? 0x20000 : 0x28000))
void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
{ {
u32 addr, val; u32 addr, val;
...@@ -775,7 +779,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) ...@@ -775,7 +779,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
trace_shmem_base = bp->common.shmem_base; trace_shmem_base = bp->common.shmem_base;
else else
trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr); trace_shmem_base = SHMEM2_RD(bp, other_shmem_base_addr);
addr = trace_shmem_base - 0x800;
/* sanity */
if (trace_shmem_base < MCPR_SCRATCH_BASE(bp) + MCPR_TRACE_BUFFER_SIZE ||
trace_shmem_base >= MCPR_SCRATCH_BASE(bp) +
SCRATCH_BUFFER_SIZE(bp)) {
BNX2X_ERR("Unable to dump trace buffer (mark %x)\n",
trace_shmem_base);
return;
}
addr = trace_shmem_base - MCPR_TRACE_BUFFER_SIZE;
/* validate TRCB signature */ /* validate TRCB signature */
mark = REG_RD(bp, addr); mark = REG_RD(bp, addr);
...@@ -787,14 +801,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) ...@@ -787,14 +801,17 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl)
/* read cyclic buffer pointer */ /* read cyclic buffer pointer */
addr += 4; addr += 4;
mark = REG_RD(bp, addr); mark = REG_RD(bp, addr);
mark = (CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH) mark = MCPR_SCRATCH_BASE(bp) + ((mark + 0x3) & ~0x3) - 0x08000000;
+ ((mark + 0x3) & ~0x3) - 0x08000000; if (mark >= trace_shmem_base || mark < addr + 4) {
BNX2X_ERR("Mark doesn't fall inside Trace Buffer\n");
return;
}
printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark); printk("%s" "begin fw dump (mark 0x%x)\n", lvl, mark);
printk("%s", lvl); printk("%s", lvl);
/* dump buffer after the mark */ /* dump buffer after the mark */
for (offset = mark; offset <= trace_shmem_base; offset += 0x8*4) { for (offset = mark; offset < trace_shmem_base; offset += 0x8*4) {
for (word = 0; word < 8; word++) for (word = 0; word < 8; word++)
data[word] = htonl(REG_RD(bp, offset + 4*word)); data[word] = htonl(REG_RD(bp, offset + 4*word));
data[8] = 0x0; data[8] = 0x0;
...@@ -4280,65 +4297,60 @@ static void _print_next_block(int idx, const char *blk) ...@@ -4280,65 +4297,60 @@ static void _print_next_block(int idx, const char *blk)
pr_cont("%s%s", idx ? ", " : "", blk); pr_cont("%s%s", idx ? ", " : "", blk);
} }
static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, static bool bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
int par_num, bool print) int *par_num, bool print)
{ {
int i = 0; u32 cur_bit;
u32 cur_bit = 0; bool res;
int i;
res = false;
for (i = 0; sig; i++) { for (i = 0; sig; i++) {
cur_bit = ((u32)0x1 << i); cur_bit = (0x1UL << i);
if (sig & cur_bit) { if (sig & cur_bit) {
switch (cur_bit) { res |= true; /* Each bit is real error! */
case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "BRB"); switch (cur_bit) {
case AEU_INPUTS_ATTN_BITS_BRB_PARITY_ERROR:
_print_next_block((*par_num)++, "BRB");
_print_parity(bp, _print_parity(bp,
BRB1_REG_BRB1_PRTY_STS); BRB1_REG_BRB1_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_PARSER_PARITY_ERROR: _print_next_block((*par_num)++,
if (print) { "PARSER");
_print_next_block(par_num++, "PARSER");
_print_parity(bp, PRS_REG_PRS_PRTY_STS); _print_parity(bp, PRS_REG_PRS_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_TSDM_PARITY_ERROR: _print_next_block((*par_num)++, "TSDM");
if (print) {
_print_next_block(par_num++, "TSDM");
_print_parity(bp, _print_parity(bp,
TSDM_REG_TSDM_PRTY_STS); TSDM_REG_TSDM_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_SEARCHER_PARITY_ERROR: _print_next_block((*par_num)++,
if (print) {
_print_next_block(par_num++,
"SEARCHER"); "SEARCHER");
_print_parity(bp, SRC_REG_SRC_PRTY_STS); _print_parity(bp, SRC_REG_SRC_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_TCM_PARITY_ERROR: _print_next_block((*par_num)++, "TCM");
if (print) { _print_parity(bp, TCM_REG_TCM_PRTY_STS);
_print_next_block(par_num++, "TCM"); break;
_print_parity(bp, case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
TCM_REG_TCM_PRTY_STS); _print_next_block((*par_num)++,
} "TSEMI");
break;
case AEU_INPUTS_ATTN_BITS_TSEMI_PARITY_ERROR:
if (print) {
_print_next_block(par_num++, "TSEMI");
_print_parity(bp, _print_parity(bp,
TSEM_REG_TSEM_PRTY_STS_0); TSEM_REG_TSEM_PRTY_STS_0);
_print_parity(bp, _print_parity(bp,
TSEM_REG_TSEM_PRTY_STS_1); TSEM_REG_TSEM_PRTY_STS_1);
} break;
break; case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_PBCLIENT_PARITY_ERROR: _print_next_block((*par_num)++, "XPB");
if (print) {
_print_next_block(par_num++, "XPB");
_print_parity(bp, GRCBASE_XPB + _print_parity(bp, GRCBASE_XPB +
PB_REG_PB_PRTY_STS); PB_REG_PB_PRTY_STS);
break;
} }
break;
} }
/* Clear the bit */ /* Clear the bit */
...@@ -4346,53 +4358,59 @@ static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig, ...@@ -4346,53 +4358,59 @@ static int bnx2x_check_blocks_with_parity0(struct bnx2x *bp, u32 sig,
} }
} }
return par_num; return res;
} }
static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, static bool bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
int par_num, bool *global, int *par_num, bool *global,
bool print) bool print)
{ {
int i = 0; u32 cur_bit;
u32 cur_bit = 0; bool res;
int i;
res = false;
for (i = 0; sig; i++) { for (i = 0; sig; i++) {
cur_bit = ((u32)0x1 << i); cur_bit = (0x1UL << i);
if (sig & cur_bit) { if (sig & cur_bit) {
res |= true; /* Each bit is real error! */
switch (cur_bit) { switch (cur_bit) {
case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_PBF_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "PBF"); _print_next_block((*par_num)++, "PBF");
_print_parity(bp, PBF_REG_PBF_PRTY_STS); _print_parity(bp, PBF_REG_PBF_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_QM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "QM"); _print_next_block((*par_num)++, "QM");
_print_parity(bp, QM_REG_QM_PRTY_STS); _print_parity(bp, QM_REG_QM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_TIMERS_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "TM"); _print_next_block((*par_num)++, "TM");
_print_parity(bp, TM_REG_TM_PRTY_STS); _print_parity(bp, TM_REG_TM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_XSDM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "XSDM"); _print_next_block((*par_num)++, "XSDM");
_print_parity(bp, _print_parity(bp,
XSDM_REG_XSDM_PRTY_STS); XSDM_REG_XSDM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_XCM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "XCM"); _print_next_block((*par_num)++, "XCM");
_print_parity(bp, XCM_REG_XCM_PRTY_STS); _print_parity(bp, XCM_REG_XCM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_XSEMI_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "XSEMI"); _print_next_block((*par_num)++,
"XSEMI");
_print_parity(bp, _print_parity(bp,
XSEM_REG_XSEM_PRTY_STS_0); XSEM_REG_XSEM_PRTY_STS_0);
_print_parity(bp, _print_parity(bp,
...@@ -4401,7 +4419,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, ...@@ -4401,7 +4419,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
break; break;
case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_DOORBELLQ_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, _print_next_block((*par_num)++,
"DOORBELLQ"); "DOORBELLQ");
_print_parity(bp, _print_parity(bp,
DORQ_REG_DORQ_PRTY_STS); DORQ_REG_DORQ_PRTY_STS);
...@@ -4409,7 +4427,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, ...@@ -4409,7 +4427,7 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
break; break;
case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_NIG_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "NIG"); _print_next_block((*par_num)++, "NIG");
if (CHIP_IS_E1x(bp)) { if (CHIP_IS_E1x(bp)) {
_print_parity(bp, _print_parity(bp,
NIG_REG_NIG_PRTY_STS); NIG_REG_NIG_PRTY_STS);
...@@ -4423,32 +4441,34 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, ...@@ -4423,32 +4441,34 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
break; break;
case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_VAUX_PCI_CORE_PARITY_ERROR:
if (print) if (print)
_print_next_block(par_num++, _print_next_block((*par_num)++,
"VAUX PCI CORE"); "VAUX PCI CORE");
*global = true; *global = true;
break; break;
case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_DEBUG_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "DEBUG"); _print_next_block((*par_num)++,
"DEBUG");
_print_parity(bp, DBG_REG_DBG_PRTY_STS); _print_parity(bp, DBG_REG_DBG_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_USDM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "USDM"); _print_next_block((*par_num)++, "USDM");
_print_parity(bp, _print_parity(bp,
USDM_REG_USDM_PRTY_STS); USDM_REG_USDM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_UCM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "UCM"); _print_next_block((*par_num)++, "UCM");
_print_parity(bp, UCM_REG_UCM_PRTY_STS); _print_parity(bp, UCM_REG_UCM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_USEMI_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "USEMI"); _print_next_block((*par_num)++,
"USEMI");
_print_parity(bp, _print_parity(bp,
USEM_REG_USEM_PRTY_STS_0); USEM_REG_USEM_PRTY_STS_0);
_print_parity(bp, _print_parity(bp,
...@@ -4457,21 +4477,21 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, ...@@ -4457,21 +4477,21 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
break; break;
case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_UPB_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "UPB"); _print_next_block((*par_num)++, "UPB");
_print_parity(bp, GRCBASE_UPB + _print_parity(bp, GRCBASE_UPB +
PB_REG_PB_PRTY_STS); PB_REG_PB_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_CSDM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "CSDM"); _print_next_block((*par_num)++, "CSDM");
_print_parity(bp, _print_parity(bp,
CSDM_REG_CSDM_PRTY_STS); CSDM_REG_CSDM_PRTY_STS);
} }
break; break;
case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR: case AEU_INPUTS_ATTN_BITS_CCM_PARITY_ERROR:
if (print) { if (print) {
_print_next_block(par_num++, "CCM"); _print_next_block((*par_num)++, "CCM");
_print_parity(bp, CCM_REG_CCM_PRTY_STS); _print_parity(bp, CCM_REG_CCM_PRTY_STS);
} }
break; break;
...@@ -4482,80 +4502,73 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig, ...@@ -4482,80 +4502,73 @@ static int bnx2x_check_blocks_with_parity1(struct bnx2x *bp, u32 sig,
} }
} }
return par_num; return res;
} }
static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, static bool bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
int par_num, bool print) int *par_num, bool print)
{ {
int i = 0; u32 cur_bit;
u32 cur_bit = 0; bool res;
int i;
res = false;
for (i = 0; sig; i++) { for (i = 0; sig; i++) {
cur_bit = ((u32)0x1 << i); cur_bit = (0x1UL << i);
if (sig & cur_bit) { if (sig & cur_bit) {
switch (cur_bit) { res |= true; /* Each bit is real error! */
case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR: if (print) {
if (print) { switch (cur_bit) {
_print_next_block(par_num++, "CSEMI"); case AEU_INPUTS_ATTN_BITS_CSEMI_PARITY_ERROR:
_print_next_block((*par_num)++,
"CSEMI");
_print_parity(bp, _print_parity(bp,
CSEM_REG_CSEM_PRTY_STS_0); CSEM_REG_CSEM_PRTY_STS_0);
_print_parity(bp, _print_parity(bp,
CSEM_REG_CSEM_PRTY_STS_1); CSEM_REG_CSEM_PRTY_STS_1);
} break;
break; case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_PXP_PARITY_ERROR: _print_next_block((*par_num)++, "PXP");
if (print) {
_print_next_block(par_num++, "PXP");
_print_parity(bp, PXP_REG_PXP_PRTY_STS); _print_parity(bp, PXP_REG_PXP_PRTY_STS);
_print_parity(bp, _print_parity(bp,
PXP2_REG_PXP2_PRTY_STS_0); PXP2_REG_PXP2_PRTY_STS_0);
_print_parity(bp, _print_parity(bp,
PXP2_REG_PXP2_PRTY_STS_1); PXP2_REG_PXP2_PRTY_STS_1);
} break;
break; case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR:
case AEU_IN_ATTN_BITS_PXPPCICLOCKCLIENT_PARITY_ERROR: _print_next_block((*par_num)++,
if (print) "PXPPCICLOCKCLIENT");
_print_next_block(par_num++, break;
"PXPPCICLOCKCLIENT"); case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
break; _print_next_block((*par_num)++, "CFC");
case AEU_INPUTS_ATTN_BITS_CFC_PARITY_ERROR:
if (print) {
_print_next_block(par_num++, "CFC");
_print_parity(bp, _print_parity(bp,
CFC_REG_CFC_PRTY_STS); CFC_REG_CFC_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_CDU_PARITY_ERROR: _print_next_block((*par_num)++, "CDU");
if (print) {
_print_next_block(par_num++, "CDU");
_print_parity(bp, CDU_REG_CDU_PRTY_STS); _print_parity(bp, CDU_REG_CDU_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_DMAE_PARITY_ERROR: _print_next_block((*par_num)++, "DMAE");
if (print) {
_print_next_block(par_num++, "DMAE");
_print_parity(bp, _print_parity(bp,
DMAE_REG_DMAE_PRTY_STS); DMAE_REG_DMAE_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_IGU_PARITY_ERROR: _print_next_block((*par_num)++, "IGU");
if (print) {
_print_next_block(par_num++, "IGU");
if (CHIP_IS_E1x(bp)) if (CHIP_IS_E1x(bp))
_print_parity(bp, _print_parity(bp,
HC_REG_HC_PRTY_STS); HC_REG_HC_PRTY_STS);
else else
_print_parity(bp, _print_parity(bp,
IGU_REG_IGU_PRTY_STS); IGU_REG_IGU_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_MISC_PARITY_ERROR: _print_next_block((*par_num)++, "MISC");
if (print) {
_print_next_block(par_num++, "MISC");
_print_parity(bp, _print_parity(bp,
MISC_REG_MISC_PRTY_STS); MISC_REG_MISC_PRTY_STS);
break;
} }
break;
} }
/* Clear the bit */ /* Clear the bit */
...@@ -4563,40 +4576,49 @@ static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig, ...@@ -4563,40 +4576,49 @@ static int bnx2x_check_blocks_with_parity2(struct bnx2x *bp, u32 sig,
} }
} }
return par_num; return res;
} }
static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num, static bool bnx2x_check_blocks_with_parity3(struct bnx2x *bp, u32 sig,
bool *global, bool print) int *par_num, bool *global,
bool print)
{ {
int i = 0; bool res = false;
u32 cur_bit = 0; u32 cur_bit;
int i;
for (i = 0; sig; i++) { for (i = 0; sig; i++) {
cur_bit = ((u32)0x1 << i); cur_bit = (0x1UL << i);
if (sig & cur_bit) { if (sig & cur_bit) {
switch (cur_bit) { switch (cur_bit) {
case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY: case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY:
if (print) if (print)
_print_next_block(par_num++, "MCP ROM"); _print_next_block((*par_num)++,
"MCP ROM");
*global = true; *global = true;
res |= true;
break; break;
case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY: case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY:
if (print) if (print)
_print_next_block(par_num++, _print_next_block((*par_num)++,
"MCP UMP RX"); "MCP UMP RX");
*global = true; *global = true;
res |= true;
break; break;
case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY: case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY:
if (print) if (print)
_print_next_block(par_num++, _print_next_block((*par_num)++,
"MCP UMP TX"); "MCP UMP TX");
*global = true; *global = true;
res |= true;
break; break;
case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY: case AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY:
if (print) if (print)
_print_next_block(par_num++, _print_next_block((*par_num)++,
"MCP SCPAD"); "MCP SCPAD");
*global = true; /* clear latched SCPAD PATIRY from MCP */
REG_WR(bp, MISC_REG_AEU_CLR_LATCH_SIGNAL,
1UL << 10);
break; break;
} }
...@@ -4605,45 +4627,50 @@ static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num, ...@@ -4605,45 +4627,50 @@ static int bnx2x_check_blocks_with_parity3(u32 sig, int par_num,
} }
} }
return par_num; return res;
} }
static int bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig, static bool bnx2x_check_blocks_with_parity4(struct bnx2x *bp, u32 sig,
int par_num, bool print) int *par_num, bool print)
{ {
int i = 0; u32 cur_bit;
u32 cur_bit = 0; bool res;
int i;
res = false;
for (i = 0; sig; i++) { for (i = 0; sig; i++) {
cur_bit = ((u32)0x1 << i); cur_bit = (0x1UL << i);
if (sig & cur_bit) { if (sig & cur_bit) {
switch (cur_bit) { res |= true; /* Each bit is real error! */
case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR: if (print) {
if (print) { switch (cur_bit) {
_print_next_block(par_num++, "PGLUE_B"); case AEU_INPUTS_ATTN_BITS_PGLUE_PARITY_ERROR:
_print_next_block((*par_num)++,
"PGLUE_B");
_print_parity(bp, _print_parity(bp,
PGLUE_B_REG_PGLUE_B_PRTY_STS); PGLUE_B_REG_PGLUE_B_PRTY_STS);
} break;
break; case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR:
case AEU_INPUTS_ATTN_BITS_ATC_PARITY_ERROR: _print_next_block((*par_num)++, "ATC");
if (print) {
_print_next_block(par_num++, "ATC");
_print_parity(bp, _print_parity(bp,
ATC_REG_ATC_PRTY_STS); ATC_REG_ATC_PRTY_STS);
break;
} }
break;
} }
/* Clear the bit */ /* Clear the bit */
sig &= ~cur_bit; sig &= ~cur_bit;
} }
} }
return par_num; return res;
} }
static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print, static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
u32 *sig) u32 *sig)
{ {
bool res = false;
if ((sig[0] & HW_PRTY_ASSERT_SET_0) || if ((sig[0] & HW_PRTY_ASSERT_SET_0) ||
(sig[1] & HW_PRTY_ASSERT_SET_1) || (sig[1] & HW_PRTY_ASSERT_SET_1) ||
(sig[2] & HW_PRTY_ASSERT_SET_2) || (sig[2] & HW_PRTY_ASSERT_SET_2) ||
...@@ -4660,23 +4687,22 @@ static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print, ...@@ -4660,23 +4687,22 @@ static bool bnx2x_parity_attn(struct bnx2x *bp, bool *global, bool print,
if (print) if (print)
netdev_err(bp->dev, netdev_err(bp->dev,
"Parity errors detected in blocks: "); "Parity errors detected in blocks: ");
par_num = bnx2x_check_blocks_with_parity0(bp, res |= bnx2x_check_blocks_with_parity0(bp,
sig[0] & HW_PRTY_ASSERT_SET_0, par_num, print); sig[0] & HW_PRTY_ASSERT_SET_0, &par_num, print);
par_num = bnx2x_check_blocks_with_parity1(bp, res |= bnx2x_check_blocks_with_parity1(bp,
sig[1] & HW_PRTY_ASSERT_SET_1, par_num, global, print); sig[1] & HW_PRTY_ASSERT_SET_1, &par_num, global, print);
par_num = bnx2x_check_blocks_with_parity2(bp, res |= bnx2x_check_blocks_with_parity2(bp,
sig[2] & HW_PRTY_ASSERT_SET_2, par_num, print); sig[2] & HW_PRTY_ASSERT_SET_2, &par_num, print);
par_num = bnx2x_check_blocks_with_parity3( res |= bnx2x_check_blocks_with_parity3(bp,
sig[3] & HW_PRTY_ASSERT_SET_3, par_num, global, print); sig[3] & HW_PRTY_ASSERT_SET_3, &par_num, global, print);
par_num = bnx2x_check_blocks_with_parity4(bp, res |= bnx2x_check_blocks_with_parity4(bp,
sig[4] & HW_PRTY_ASSERT_SET_4, par_num, print); sig[4] & HW_PRTY_ASSERT_SET_4, &par_num, print);
if (print) if (print)
pr_cont("\n"); pr_cont("\n");
}
return true; return res;
} else
return false;
} }
/** /**
...@@ -7126,7 +7152,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) ...@@ -7126,7 +7152,7 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
int port = BP_PORT(bp); int port = BP_PORT(bp);
int init_phase = port ? PHASE_PORT1 : PHASE_PORT0; int init_phase = port ? PHASE_PORT1 : PHASE_PORT0;
u32 low, high; u32 low, high;
u32 val; u32 val, reg;
DP(NETIF_MSG_HW, "starting port init port %d\n", port); DP(NETIF_MSG_HW, "starting port init port %d\n", port);
...@@ -7271,6 +7297,17 @@ static int bnx2x_init_hw_port(struct bnx2x *bp) ...@@ -7271,6 +7297,17 @@ static int bnx2x_init_hw_port(struct bnx2x *bp)
val |= CHIP_IS_E1(bp) ? 0 : 0x10; val |= CHIP_IS_E1(bp) ? 0 : 0x10;
REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val); REG_WR(bp, MISC_REG_AEU_MASK_ATTN_FUNC_0 + port*4, val);
/* SCPAD_PARITY should NOT trigger close the gates */
reg = port ? MISC_REG_AEU_ENABLE4_NIG_1 : MISC_REG_AEU_ENABLE4_NIG_0;
REG_WR(bp, reg,
REG_RD(bp, reg) &
~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
reg = port ? MISC_REG_AEU_ENABLE4_PXP_1 : MISC_REG_AEU_ENABLE4_PXP_0;
REG_WR(bp, reg,
REG_RD(bp, reg) &
~AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY);
bnx2x_init_block(bp, BLOCK_NIG, init_phase); bnx2x_init_block(bp, BLOCK_NIG, init_phase);
if (!CHIP_IS_E1x(bp)) { if (!CHIP_IS_E1x(bp)) {
...@@ -11685,9 +11722,6 @@ static int bnx2x_init_bp(struct bnx2x *bp) ...@@ -11685,9 +11722,6 @@ static int bnx2x_init_bp(struct bnx2x *bp)
static int bnx2x_open(struct net_device *dev) static int bnx2x_open(struct net_device *dev)
{ {
struct bnx2x *bp = netdev_priv(dev); struct bnx2x *bp = netdev_priv(dev);
bool global = false;
int other_engine = BP_PATH(bp) ? 0 : 1;
bool other_load_status, load_status;
int rc; int rc;
bp->stats_init = true; bp->stats_init = true;
...@@ -11703,6 +11737,10 @@ static int bnx2x_open(struct net_device *dev) ...@@ -11703,6 +11737,10 @@ static int bnx2x_open(struct net_device *dev)
* Parity recovery is only relevant for PF driver. * Parity recovery is only relevant for PF driver.
*/ */
if (IS_PF(bp)) { if (IS_PF(bp)) {
int other_engine = BP_PATH(bp) ? 0 : 1;
bool other_load_status, load_status;
bool global = false;
other_load_status = bnx2x_get_load_status(bp, other_engine); other_load_status = bnx2x_get_load_status(bp, other_engine);
load_status = bnx2x_get_load_status(bp, BP_PATH(bp)); load_status = bnx2x_get_load_status(bp, BP_PATH(bp));
if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) || if (!bnx2x_reset_is_done(bp, BP_PATH(bp)) ||
...@@ -12080,7 +12118,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) ...@@ -12080,7 +12118,6 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp)
struct device *dev = &bp->pdev->dev; struct device *dev = &bp->pdev->dev;
if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) { if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {
bp->flags |= USING_DAC_FLAG;
if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) { if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {
dev_err(dev, "dma_set_coherent_mask failed, aborting\n"); dev_err(dev, "dma_set_coherent_mask failed, aborting\n");
return -EIO; return -EIO;
...@@ -12248,8 +12285,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, ...@@ -12248,8 +12285,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev,
NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA; NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_HIGHDMA;
dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX; dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX;
if (bp->flags & USING_DAC_FLAG) dev->features |= NETIF_F_HIGHDMA;
dev->features |= NETIF_F_HIGHDMA;
/* Add Loopback capability to the device */ /* Add Loopback capability to the device */
dev->hw_features |= NETIF_F_LOOPBACK; dev->hw_features |= NETIF_F_LOOPBACK;
...@@ -12612,24 +12648,24 @@ static int set_max_cos_est(int chip_id) ...@@ -12612,24 +12648,24 @@ static int set_max_cos_est(int chip_id)
return BNX2X_MULTI_TX_COS_E1X; return BNX2X_MULTI_TX_COS_E1X;
case BCM57712: case BCM57712:
case BCM57712_MF: case BCM57712_MF:
case BCM57712_VF:
return BNX2X_MULTI_TX_COS_E2_E3A0; return BNX2X_MULTI_TX_COS_E2_E3A0;
case BCM57800: case BCM57800:
case BCM57800_MF: case BCM57800_MF:
case BCM57800_VF:
case BCM57810: case BCM57810:
case BCM57810_MF: case BCM57810_MF:
case BCM57840_4_10: case BCM57840_4_10:
case BCM57840_2_20: case BCM57840_2_20:
case BCM57840_O: case BCM57840_O:
case BCM57840_MFO: case BCM57840_MFO:
case BCM57810_VF:
case BCM57840_MF: case BCM57840_MF:
case BCM57840_VF:
case BCM57811: case BCM57811:
case BCM57811_MF: case BCM57811_MF:
case BCM57811_VF:
return BNX2X_MULTI_TX_COS_E3B0; return BNX2X_MULTI_TX_COS_E3B0;
case BCM57712_VF:
case BCM57800_VF:
case BCM57810_VF:
case BCM57840_VF:
case BCM57811_VF:
return 1; return 1;
default: default:
pr_err("Unknown board_type (%d), aborting\n", chip_id); pr_err("Unknown board_type (%d), aborting\n", chip_id);
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
View file @ 4440c6f7
...@@ -470,10 +470,10 @@ static int bnx2x_vfop_qdtor_cmd(struct bnx2x *bp, ...@@ -470,10 +470,10 @@ static int bnx2x_vfop_qdtor_cmd(struct bnx2x *bp,
bnx2x_vfop_qdtor, cmd->done); bnx2x_vfop_qdtor, cmd->done);
return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor, return bnx2x_vfop_transition(bp, vf, bnx2x_vfop_qdtor,
cmd->block); cmd->block);
} else {
BNX2X_ERR("VF[%d] failed to add a vfop\n", vf->abs_vfid);
return -ENOMEM;
} }
DP(BNX2X_MSG_IOV, "VF[%d] failed to add a vfop. rc %d\n",
vf->abs_vfid, vfop->rc);
return -ENOMEM;
} }
static void static void
...@@ -3390,14 +3390,16 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) ...@@ -3390,14 +3390,16 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac)
rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true); rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_ETH_MAC, true);
if (rc) { if (rc) {
BNX2X_ERR("failed to delete eth macs\n"); BNX2X_ERR("failed to delete eth macs\n");
return -EINVAL; rc = -EINVAL;
goto out;
} }
/* remove existing uc list macs */ /* remove existing uc list macs */
rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true); rc = bnx2x_del_all_macs(bp, mac_obj, BNX2X_UC_LIST_MAC, true);
if (rc) { if (rc) {
BNX2X_ERR("failed to delete uc_list macs\n"); BNX2X_ERR("failed to delete uc_list macs\n");
return -EINVAL; rc = -EINVAL;
goto out;
} }
/* configure the new mac to device */ /* configure the new mac to device */
...@@ -3405,6 +3407,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) ...@@ -3405,6 +3407,7 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac)
bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true, bnx2x_set_mac_one(bp, (u8 *)&bulletin->mac, mac_obj, true,
BNX2X_ETH_MAC, &ramrod_flags); BNX2X_ETH_MAC, &ramrod_flags);
out:
bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC); bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_MAC);
} }
...@@ -3467,7 +3470,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) ...@@ -3467,7 +3470,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
&ramrod_flags); &ramrod_flags);
if (rc) { if (rc) {
BNX2X_ERR("failed to delete vlans\n"); BNX2X_ERR("failed to delete vlans\n");
return -EINVAL; rc = -EINVAL;
goto out;
} }
/* send queue update ramrod to configure default vlan and silent /* send queue update ramrod to configure default vlan and silent
...@@ -3501,7 +3505,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) ...@@ -3501,7 +3505,8 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
rc = bnx2x_config_vlan_mac(bp, &ramrod_param); rc = bnx2x_config_vlan_mac(bp, &ramrod_param);
if (rc) { if (rc) {
BNX2X_ERR("failed to configure vlan\n"); BNX2X_ERR("failed to configure vlan\n");
return -EINVAL; rc = -EINVAL;
goto out;
} }
/* configure default vlan to vf queue and set silent /* configure default vlan to vf queue and set silent
...@@ -3519,18 +3524,18 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) ...@@ -3519,18 +3524,18 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)
rc = bnx2x_queue_state_change(bp, &q_params); rc = bnx2x_queue_state_change(bp, &q_params);
if (rc) { if (rc) {
BNX2X_ERR("Failed to configure default VLAN\n"); BNX2X_ERR("Failed to configure default VLAN\n");
return rc; goto out;
} }
/* clear the flag indicating that this VF needs its vlan /* clear the flag indicating that this VF needs its vlan
* (will only be set if the HV configured th Vlan before vf was * (will only be set if the HV configured the Vlan before vf was
* and we were called because the VF came up later * up and we were called because the VF came up later
*/ */
out:
vf->cfg_flags &= ~VF_CFG_VLAN; vf->cfg_flags &= ~VF_CFG_VLAN;
bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN); bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
} }
return 0; return rc;
} }
/* crc is the first field in the bulletin board. Compute the crc over the /* crc is the first field in the bulletin board. Compute the crc over the
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
View file @ 4440c6f7
...@@ -196,7 +196,7 @@ static void bnx2x_hw_stats_post(struct bnx2x *bp) ...@@ -196,7 +196,7 @@ static void bnx2x_hw_stats_post(struct bnx2x *bp)
} else if (bp->func_stx) { } else if (bp->func_stx) {
*stats_comp = 0; *stats_comp = 0;
bnx2x_post_dmae(bp, dmae, INIT_DMAE_C(bp)); bnx2x_issue_dmae_with_comp(bp, dmae, stats_comp);
} }
} }
......
drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
View file @ 4440c6f7
...@@ -980,7 +980,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf, ...@@ -980,7 +980,7 @@ static int bnx2x_copy32_vf_dmae(struct bnx2x *bp, u8 from_vf,
dmae.len = len32; dmae.len = len32;
/* issue the command and wait for completion */ /* issue the command and wait for completion */
return bnx2x_issue_dmae_with_comp(bp, &dmae); return bnx2x_issue_dmae_with_comp(bp, &dmae, bnx2x_sp(bp, wb_comp));
} }
static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf) static void bnx2x_vf_mbx_resp(struct bnx2x *bp, struct bnx2x_virtf *vf)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7