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

Commit 1ac9e428 authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Fix port type display 



Display the current media type connected to the port in ethtool.

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4d78f12

drivers/net/bnx2x/bnx2x.h

+1 −1
Original line number Diff line number Diff line
@@ -1492,7 +1492,7 @@ void bnx2x_invalidate_e1h_mc_list(struct bnx2x *bp); 
void bnx2x_invalidate_uc_list(struct bnx2x *bp);



void bnx2x_update_coalesce(struct bnx2x *bp);

int bnx2x_get_link_cfg_idx(struct bnx2x *bp);

int bnx2x_get_cur_phy_idx(struct bnx2x *bp);



static inline u32 reg_poll(struct bnx2x *bp, u32 reg, u32 expected, int ms,

			   int wait)

drivers/net/bnx2x/bnx2x_cmn.c

+49 −0
Original line number Diff line number Diff line
@@ -2803,6 +2803,55 @@ static int bnx2x_reload_if_running(struct net_device *dev) 
	return bnx2x_nic_load(bp, LOAD_NORMAL);

}



int bnx2x_get_cur_phy_idx(struct bnx2x *bp)

{

	u32 sel_phy_idx = 0;

	if (bp->link_params.num_phys <= 1)

		return INT_PHY;



	if (bp->link_vars.link_up) {

		sel_phy_idx = EXT_PHY1;

		/* In case link is SERDES, check if the EXT_PHY2 is the one */

		if ((bp->link_vars.link_status & LINK_STATUS_SERDES_LINK) &&

		    (bp->link_params.phy[EXT_PHY2].supported & SUPPORTED_FIBRE))

			sel_phy_idx = EXT_PHY2;

	} else {



		switch (bnx2x_phy_selection(&bp->link_params)) {

		case PORT_HW_CFG_PHY_SELECTION_HARDWARE_DEFAULT:

		case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY:

		case PORT_HW_CFG_PHY_SELECTION_FIRST_PHY_PRIORITY:

		       sel_phy_idx = EXT_PHY1;

		       break;

		case PORT_HW_CFG_PHY_SELECTION_SECOND_PHY:

		case PORT_HW_CFG_PHY_SELECTION_SECOND_PHY_PRIORITY:

		       sel_phy_idx = EXT_PHY2;

		       break;

		}

	}



	return sel_phy_idx;



}

int bnx2x_get_link_cfg_idx(struct bnx2x *bp)

{

	u32 sel_phy_idx = bnx2x_get_cur_phy_idx(bp);

	/*

	 * The selected actived PHY is always after swapping (in case PHY

	 * swapping is enabled). So when swapping is enabled, we need to reverse

	 * the configuration

	 */



	if (bp->link_params.multi_phy_config &

	    PORT_HW_CFG_PHY_SWAPPED_ENABLED) {

		if (sel_phy_idx == EXT_PHY1)

			sel_phy_idx = EXT_PHY2;

		else if (sel_phy_idx == EXT_PHY2)

			sel_phy_idx = EXT_PHY1;

	}

	return LINK_CONFIG_IDX(sel_phy_idx);

}



/* called with rtnl_lock */

int bnx2x_change_mtu(struct net_device *dev, int new_mtu)

{

drivers/net/bnx2x/bnx2x_cmn.h

+2 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,8 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp) 
}

#endif



int bnx2x_get_link_cfg_idx(struct bnx2x *bp);



static inline void __storm_memset_struct(struct bnx2x *bp,

					 u32 addr, size_t size, u32 *data)

{

drivers/net/bnx2x/bnx2x_ethtool.c

+28 −6
Original line number Diff line number Diff line
@@ -162,6 +162,33 @@ static const struct { 
};



#define BNX2X_NUM_STATS		ARRAY_SIZE(bnx2x_stats_arr)

static int bnx2x_get_port_type(struct bnx2x *bp)

{

	int port_type;

	u32 phy_idx = bnx2x_get_cur_phy_idx(bp);

	switch (bp->link_params.phy[phy_idx].media_type) {

	case ETH_PHY_SFP_FIBER:

	case ETH_PHY_XFP_FIBER:

	case ETH_PHY_KR:

	case ETH_PHY_CX4:

		port_type = PORT_FIBRE;

		break;

	case ETH_PHY_DA_TWINAX:

		port_type = PORT_DA;

		break;

	case ETH_PHY_BASE_T:

		port_type = PORT_TP;

		break;

	case ETH_PHY_NOT_PRESENT:

		port_type = PORT_NONE;

		break;

	case ETH_PHY_UNSPECIFIED:

	default:

		port_type = PORT_OTHER;

		break;

	}

	return port_type;

}



static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{
@@ -188,12 +215,7 @@ static int bnx2x_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) 
	if (IS_MF(bp))

		ethtool_cmd_speed_set(cmd, bnx2x_get_mf_speed(bp));



	if (bp->port.supported[cfg_idx] & SUPPORTED_TP)

		cmd->port = PORT_TP;

	else if (bp->port.supported[cfg_idx] & SUPPORTED_FIBRE)

		cmd->port = PORT_FIBRE;

	else

		BNX2X_ERR("XGXS PHY Failure detected\n");

	cmd->port = bnx2x_get_port_type(bp);



	cmd->phy_address = bp->mdio.prtad;

	cmd->transceiver = XCVR_INTERNAL;

drivers/net/bnx2x/bnx2x_hsi.h

+11 −1
Original line number Diff line number Diff line
@@ -263,7 +263,17 @@ struct port_hw_cfg { /* port 0: 0x12c port 1: 0x2bc */ 
#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO2		      0x00000200

#define PORT_HW_CFG_FAULT_MODULE_LED_GPIO3		      0x00000300

#define PORT_HW_CFG_FAULT_MODULE_LED_DISABLED		      0x00000400

	u32 Reserved01[12];				    /* 0x158 */

	u32 Reserved01[11];				    /* 0x158 */



	u32 media_type;					/* 0x194 */

#define PORT_HW_CFG_MEDIA_TYPE_PHY0_MASK		      0x000000FF

#define PORT_HW_CFG_MEDIA_TYPE_PHY0_SHIFT		      0



#define PORT_HW_CFG_MEDIA_TYPE_PHY1_MASK		      0x0000FF00

#define PORT_HW_CFG_MEDIA_TYPE_PHY1_SHIFT		      8



#define PORT_HW_CFG_MEDIA_TYPE_PHY2_MASK		      0x00FF0000

#define PORT_HW_CFG_MEDIA_TYPE_PHY2_SHIFT		      16

	/*  for external PHY, or forced mode or during AN */

	u16 xgxs_config_rx[4];				    /* 0x198 */