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

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

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+10 −5
Original line number Diff line number Diff line
@@ -1197,8 +1197,9 @@ union cdu_context { 
/* TM (timers) host DB constants */

#define TM_ILT_PAGE_SZ_HW	0

#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		1024

#define TM_CONN_NUM		(BNX2X_FIRST_VF_CID + \

				 BNX2X_VF_CIDS + \

				 CNIC_ISCSI_CID_MAX)

#define TM_ILT_SZ		(8 * TM_CONN_NUM)

#define TM_ILT_LINES		DIV_ROUND_UP(TM_ILT_SZ, TM_ILT_PAGE_SZ)
@@ -1527,7 +1528,6 @@ struct bnx2x { 
#define PCI_32BIT_FLAG			(1 << 1)

#define ONE_PORT_FLAG			(1 << 2)

#define NO_WOL_FLAG			(1 << 3)

#define USING_DAC_FLAG			(1 << 4)

#define USING_MSIX_FLAG			(1 << 5)

#define USING_MSI_FLAG			(1 << 6)

#define DISABLE_MSI_FLAG		(1 << 7)
@@ -1621,7 +1621,7 @@ struct bnx2x { 
	u16			rx_ticks_int;

	u16			rx_ticks;

/* Maximal coalescing timeout in us */

#define BNX2X_MAX_COALESCE_TOUT		(0xf0*12)

#define BNX2X_MAX_COALESCE_TOUT		(0xff*BNX2X_BTR)



	u32			lin_cnt;
@@ -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,

			       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 */

u32 bnx2x_flr_clnup_poll_count(struct bnx2x *bp);
@@ -2498,4 +2499,8 @@ enum bnx2x_pci_bus_speed { 
};



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 */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+2 −38
Original line number Diff line number Diff line
@@ -891,17 +891,8 @@ static void bnx2x_get_regs(struct net_device *dev, 
	 * will re-enable parity attentions right after the dump.

	 */



	/* Disable parity on path 0 */

	bnx2x_pretend_func(bp, 0);

	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.preset = DUMP_ALL_PRESETS;

	dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -928,18 +919,9 @@ static void bnx2x_get_regs(struct net_device *dev, 
	/* Actually read the registers */

	__bnx2x_get_regs(bp, p);



	/* Re-enable parity attentions on path 0 */

	bnx2x_pretend_func(bp, 0);

	/* Re-enable parity attentions */

	bnx2x_clear_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)
@@ -993,17 +975,8 @@ static int bnx2x_get_dump_data(struct net_device *dev, 
	 * will re-enable parity attentions right after the dump.

	 */



	/* Disable parity on path 0 */

	bnx2x_pretend_func(bp, 0);

	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.preset = bp->dump_preset_idx;

	dump_hdr.version = BNX2X_DUMP_VERSION;
@@ -1032,19 +1005,10 @@ static int bnx2x_get_dump_data(struct net_device *dev, 
	/* Actually read the registers */

	__bnx2x_get_preset_regs(bp, p, dump_hdr.preset);



	/* Re-enable parity attentions on path 0 */

	bnx2x_pretend_func(bp, 0);

	/* Re-enable parity attentions */

	bnx2x_clear_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;

}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h

+25 −13
Original line number Diff line number Diff line
@@ -640,23 +640,35 @@ static const struct { 
 * [30] MCP Latched ump_tx_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_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)



/* Below registers control the MCP parity attention output. When

 * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are

 * enabled, when cleared - disabled.

 */

static const u32 mcp_attn_ctl_regs[] = {

	MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,

	MISC_REG_AEU_ENABLE4_NIG_0,

	MISC_REG_AEU_ENABLE4_PXP_0,

	MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,

	MISC_REG_AEU_ENABLE4_NIG_1,

	MISC_REG_AEU_ENABLE4_PXP_1

static const struct {

	u32 addr;

	u32 bits;

} mcp_attn_ctl_regs[] = {

	{ MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,

		MISC_AEU_ENABLE_MCP_PRTY_BITS },

	{ 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)
@@ -665,14 +677,14 @@ static inline void bnx2x_set_mcp_parity(struct bnx2x *bp, u8 enable) 
	u32 reg_val;



	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)

			reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS;

			reg_val |= mcp_attn_ctl_regs[i].bits;

		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

+212 −176

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c

+17 −12

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE