Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35b19ba5 authored by Eilon Greenstein's avatar Eilon Greenstein Committed by David S. Miller
Browse files

bnx2x: Removing the board type 



There are too many different board types and this field is not scalable.
Removing it and making decisions according to other fields

Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c06328c

drivers/net/bnx2x.h

+0 −1
Original line number Diff line number Diff line
@@ -523,7 +523,6 @@ struct bnx2x_common { 
	u32			shmem_base;



	u32			hw_config;

	u32			board;



	u32			bc_ver;

drivers/net/bnx2x_hsi.h

+7 −27
Original line number Diff line number Diff line
@@ -119,35 +119,15 @@ struct shared_hw_cfg { /* NVRAM Offset */ 
#define SHARED_HW_CFG_UMP_NC_SI_EXT_PHY_TYPE_BCM5221 0x00010000



	u32 board;						/* 0x124 */

#define SHARED_HW_CFG_BOARD_TYPE_MASK		    0x0000ffff

#define SHARED_HW_CFG_BOARD_TYPE_SHIFT		    0

#define SHARED_HW_CFG_BOARD_TYPE_NONE		    0x00000000

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1000     0x00000001

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1001     0x00000002

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1002G    0x00000003

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1004G    0x00000004

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1007G    0x00000005

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1015G    0x00000006

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1020G    0x00000007

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710T1003G    0x00000008

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G    0x00000009

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G    0x0000000a

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1023G    0x0000000b

#define SHARED_HW_CFG_BOARD_TYPE_BCM957710A1033G    0x0000000c

#define SHARED_HW_CFG_BOARD_TYPE_BCM957711T1101     0x0000000d

#define SHARED_HW_CFG_BOARD_TYPE_BCM957711ET1201    0x0000000e

#define SHARED_HW_CFG_BOARD_TYPE_BCM957711A1133G    0x0000000f

#define SHARED_HW_CFG_BOARD_TYPE_BCM957711EA1233G   0x00000010



#define SHARED_HW_CFG_BOARD_VER_MASK		    0xffff0000

#define SHARED_HW_CFG_BOARD_VER_SHIFT		    16

#define SHARED_HW_CFG_BOARD_MAJOR_VER_MASK	    0xf0000000

#define SHARED_HW_CFG_BOARD_MAJOR_VER_SHIFT	    28

#define SHARED_HW_CFG_BOARD_MINOR_VER_MASK	    0x0f000000

#define SHARED_HW_CFG_BOARD_MINOR_VER_SHIFT	    24

#define SHARED_HW_CFG_BOARD_REV_MASK		    0x00ff0000

#define SHARED_HW_CFG_BOARD_REV_MASK		    0x00FF0000

#define SHARED_HW_CFG_BOARD_REV_SHIFT		    16



#define SHARED_HW_CFG_BOARD_MAJOR_VER_MASK	    0x0F000000

#define SHARED_HW_CFG_BOARD_MAJOR_VER_SHIFT	    24



#define SHARED_HW_CFG_BOARD_MINOR_VER_MASK	    0xF0000000

#define SHARED_HW_CFG_BOARD_MINOR_VER_SHIFT	    28



	u32 reserved;						/* 0x128 */



};

drivers/net/bnx2x_main.c

+7 −13
Original line number Diff line number Diff line
@@ -2505,9 +2505,8 @@ static inline void bnx2x_attn_int_deasserted0(struct bnx2x *bp, u32 attn) 


		BNX2X_ERR("SPIO5 hw attention\n");



		switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {

		case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:

		case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:

		switch (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config)) {

		case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:

			/* Fan failure attention */



			/* The PHY reset is controlled by GPIO 1 */
@@ -5622,9 +5621,8 @@ static int bnx2x_init_common(struct bnx2x *bp) 
		return -EBUSY;

	}



	switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {

	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:

	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:

	switch (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config)) {

	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:

		/* Fan failure is indicated by SPIO 5 */

		bnx2x_set_spio(bp, MISC_REGISTERS_SPIO_5,

			       MISC_REGISTERS_SPIO_INPUT_HI_Z);
@@ -5830,9 +5828,8 @@ static int bnx2x_init_port(struct bnx2x *bp) 
	/* Port MCP comes here */

	/* Port DMAE comes here */



	switch (bp->common.board & SHARED_HW_CFG_BOARD_TYPE_MASK) {

	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1021G:

	case SHARED_HW_CFG_BOARD_TYPE_BCM957710A1022G:

	switch (XGXS_EXT_PHY_TYPE(bp->link_params.ext_phy_config)) {

	case PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101:

		/* add SPIO 5 to group 0 */

		val = REG_RD(bp, MISC_REG_AEU_ENABLE1_FUNC_0_OUT_0);

		val |= AEU_INPUTS_ATTN_BITS_SPIO5;
@@ -7433,10 +7430,7 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp) 
		BNX2X_ERR("BAD MCP validity signature\n");



	bp->common.hw_config = SHMEM_RD(bp, dev_info.shared_hw_config.config);

	bp->common.board = SHMEM_RD(bp, dev_info.shared_hw_config.board);



	BNX2X_DEV_INFO("hw_config 0x%08x  board 0x%08x\n",

		       bp->common.hw_config, bp->common.board);

	BNX2X_DEV_INFO("hw_config 0x%08x\n", bp->common.hw_config);



	bp->link_params.hw_led_mode = ((bp->common.hw_config &

					SHARED_HW_CFG_LED_MODE_MASK) >>