bnx2x: Coalesce pr_cont uses and fix DP typos (94f05b0f) · Commits · e / devices / android_kernel_fairphone_FP5

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

+23 −19

Original line number	Original line	Diff line number	Diff line
	@@ -953,15 +953,16 @@ void __bnx2x_link_report(struct bnx2x *bp)
	netdev_err(bp->dev, "NIC Link is Down\n");		netdev_err(bp->dev, "NIC Link is Down\n");
	return;		return;
	} else {		} else {
			const char *duplex;
			const char *flow;

	netif_carrier_on(bp->dev);		netif_carrier_on(bp->dev);
	netdev_info(bp->dev, "NIC Link is Up, ");
	pr_cont("%d Mbps ", cur_data.line_speed);

	if (test_and_clear_bit(BNX2X_LINK_REPORT_FD,		if (test_and_clear_bit(BNX2X_LINK_REPORT_FD,
	&cur_data.link_report_flags))		&cur_data.link_report_flags))
	pr_cont("full duplex");		duplex = "full";
	else		else
	pr_cont("half duplex");		duplex = "half";

	/* Handle the FC at the end so that only these flags would be		/* Handle the FC at the end so that only these flags would be
	* possibly set. This way we may easily check if there is no FC		* possibly set. This way we may easily check if there is no FC
	@@ -970,16 +971,19 @@ void __bnx2x_link_report(struct bnx2x *bp)
	if (cur_data.link_report_flags) {		if (cur_data.link_report_flags) {
	if (test_bit(BNX2X_LINK_REPORT_RX_FC_ON,		if (test_bit(BNX2X_LINK_REPORT_RX_FC_ON,
	&cur_data.link_report_flags)) {		&cur_data.link_report_flags)) {
	pr_cont(", receive ");
	if (test_bit(BNX2X_LINK_REPORT_TX_FC_ON,		if (test_bit(BNX2X_LINK_REPORT_TX_FC_ON,
	&cur_data.link_report_flags))		&cur_data.link_report_flags))
	pr_cont("& transmit ");		flow = "ON - receive & transmit";
			else
			flow = "ON - receive";
	} else {		} else {
	pr_cont(", transmit ");		flow = "ON - transmit";
	}		}
	pr_cont("flow control ON");		} else {
			flow = "none";
	}		}
	pr_cont("\n");		netdev_info(bp->dev, "NIC Link is Up, %d Mbps %s duplex, Flow control: %s\n",
			cur_data.line_speed, duplex, flow);
	}		}
	}		}

	@@ -2584,7 +2588,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)
	#endif		#endif

	/* enable this debug print to view the transmission queue being used		/* enable this debug print to view the transmission queue being used
	DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d",		DP(BNX2X_MSG_FP, "indices: txq %d, fp %d, txdata %d\n",
	txq_index, fp_index, txdata_index); */		txq_index, fp_index, txdata_index); */

	/* locate the fastpath and the txdata */		/* locate the fastpath and the txdata */
	@@ -2593,7 +2597,7 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)

	/* enable this debug print to view the tranmission details		/* enable this debug print to view the tranmission details
	DP(BNX2X_MSG_FP,"transmitting packet cid %d fp index %d txdata_index %d"		DP(BNX2X_MSG_FP,"transmitting packet cid %d fp index %d txdata_index %d"
	" tx_data ptr %p fp pointer %p",		" tx_data ptr %p fp pointer %p\n",
	txdata->cid, fp_index, txdata_index, txdata, fp); */		txdata->cid, fp_index, txdata_index, txdata, fp); */

	if (unlikely(bnx2x_tx_avail(bp, txdata) <		if (unlikely(bnx2x_tx_avail(bp, txdata) <
	@@ -2910,14 +2914,14 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
	/* requested to support too many traffic classes */		/* requested to support too many traffic classes */
	if (num_tc > bp->max_cos) {		if (num_tc > bp->max_cos) {
	DP(NETIF_MSG_TX_ERR, "support for too many traffic classes"		DP(NETIF_MSG_TX_ERR, "support for too many traffic classes"
	" requested: %d. max supported is %d",		" requested: %d. max supported is %d\n",
	num_tc, bp->max_cos);		num_tc, bp->max_cos);
	return -EINVAL;		return -EINVAL;
	}		}

	/* declare amount of supported traffic classes */		/* declare amount of supported traffic classes */
	if (netdev_set_num_tc(dev, num_tc)) {		if (netdev_set_num_tc(dev, num_tc)) {
	DP(NETIF_MSG_TX_ERR, "failed to declare %d traffic classes",		DP(NETIF_MSG_TX_ERR, "failed to declare %d traffic classes\n",
	num_tc);		num_tc);
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -2925,7 +2929,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
	/* configure priority to traffic class mapping */		/* configure priority to traffic class mapping */
	for (prio = 0; prio < BNX2X_MAX_PRIORITY; prio++) {		for (prio = 0; prio < BNX2X_MAX_PRIORITY; prio++) {
	netdev_set_prio_tc_map(dev, prio, bp->prio_to_cos[prio]);		netdev_set_prio_tc_map(dev, prio, bp->prio_to_cos[prio]);
	DP(BNX2X_MSG_SP, "mapping priority %d to tc %d",		DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n",
	prio, bp->prio_to_cos[prio]);		prio, bp->prio_to_cos[prio]);
	}		}

	@@ -2934,10 +2938,10 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
	This can be used for ets or pfc, and save the effort of setting		This can be used for ets or pfc, and save the effort of setting
	up a multio class queue disc or negotiating DCBX with a switch		up a multio class queue disc or negotiating DCBX with a switch
	netdev_set_prio_tc_map(dev, 0, 0);		netdev_set_prio_tc_map(dev, 0, 0);
	DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", 0, 0);		DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", 0, 0);
	for (prio = 1; prio < 16; prio++) {		for (prio = 1; prio < 16; prio++) {
	netdev_set_prio_tc_map(dev, prio, 1);		netdev_set_prio_tc_map(dev, prio, 1);
	DP(BNX2X_MSG_SP, "mapping priority %d to tc %d", prio, 1);		DP(BNX2X_MSG_SP, "mapping priority %d to tc %d\n", prio, 1);
	} */		} */

	/* configure traffic class to transmission queue mapping */		/* configure traffic class to transmission queue mapping */
	@@ -2945,7 +2949,7 @@ int bnx2x_setup_tc(struct net_device *dev, u8 num_tc)
	count = BNX2X_NUM_ETH_QUEUES(bp);		count = BNX2X_NUM_ETH_QUEUES(bp);
	offset = cos * MAX_TXQS_PER_COS;		offset = cos * MAX_TXQS_PER_COS;
	netdev_set_tc_queue(dev, cos, count, offset);		netdev_set_tc_queue(dev, cos, count, offset);
	DP(BNX2X_MSG_SP, "mapping tc %d to offset %d count %d",		DP(BNX2X_MSG_SP, "mapping tc %d to offset %d count %d\n",
	cos, offset, count);		cos, offset, count);
	}		}

	@@ -3033,7 +3037,7 @@ static void bnx2x_free_fp_mem_at(struct bnx2x *bp, int fp_index)
	struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];		struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];

	DP(BNX2X_MSG_SP,		DP(BNX2X_MSG_SP,
	"freeing tx memory of fp %d cos %d cid %d",		"freeing tx memory of fp %d cos %d cid %d\n",
	fp_index, cos, txdata->cid);		fp_index, cos, txdata->cid);

	BNX2X_FREE(txdata->tx_buf_ring);		BNX2X_FREE(txdata->tx_buf_ring);
	@@ -3115,7 +3119,7 @@ static int bnx2x_alloc_fp_mem_at(struct bnx2x *bp, int index)
	struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];		struct bnx2x_fp_txdata *txdata = &fp->txdata[cos];

	DP(BNX2X_MSG_SP, "allocating tx memory of "		DP(BNX2X_MSG_SP, "allocating tx memory of "
	"fp %d cos %d",		"fp %d cos %d\n",
	index, cos);		index, cos);

	BNX2X_ALLOC(txdata->tx_buf_ring,		BNX2X_ALLOC(txdata->tx_buf_ring,

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1289,7 +1289,7 @@ static inline void bnx2x_init_txdata(struct bnx2x *bp,
	txdata->txq_index = txq_index;		txdata->txq_index = txq_index;
	txdata->tx_cons_sb = tx_cons_sb;		txdata->tx_cons_sb = tx_cons_sb;

	DP(BNX2X_MSG_SP, "created tx data cid %d, txq %d",		DP(BNX2X_MSG_SP, "created tx data cid %d, txq %d\n",
	txdata->cid, txdata->txq_index);		txdata->cid, txdata->txq_index);
	}		}

	@@ -1333,7 +1333,7 @@ static inline void bnx2x_init_fcoe_fp(struct bnx2x *bp)
	bnx2x_init_txdata(bp, &bnx2x_fcoe(bp, txdata[0]),		bnx2x_init_txdata(bp, &bnx2x_fcoe(bp, txdata[0]),
	fp->cid, FCOE_TXQ_IDX(bp), BNX2X_FCOE_L2_TX_INDEX);		fp->cid, FCOE_TXQ_IDX(bp), BNX2X_FCOE_L2_TX_INDEX);

	DP(BNX2X_MSG_SP, "created fcoe tx data (fp index %d)", fp->index);		DP(BNX2X_MSG_SP, "created fcoe tx data (fp index %d)\n", fp->index);

	/* qZone id equals to FW (per path) client id */		/* qZone id equals to FW (per path) client id */
	bnx2x_fcoe(bp, cl_qzone_id) = bnx2x_fp_qzone_id(fp);		bnx2x_fcoe(bp, cl_qzone_id) = bnx2x_fp_qzone_id(fp);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -350,7 +350,7 @@ static void bnx2x_dcbx_map_nw(struct bnx2x *bp)
	if (cos_params[i].pri_bitmask & nw_prio) {		if (cos_params[i].pri_bitmask & nw_prio) {
	/* extend the bitmask with unmapped */		/* extend the bitmask with unmapped */
	DP(NETIF_MSG_LINK,		DP(NETIF_MSG_LINK,
	"cos %d extended with 0x%08x", i, unmapped);		"cos %d extended with 0x%08x\n", i, unmapped);
	cos_params[i].pri_bitmask \|= unmapped;		cos_params[i].pri_bitmask \|= unmapped;
	break;		break;
	}		}

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

+80 −73

Original line number	Original line	Diff line number	Diff line
	@@ -694,8 +694,8 @@ static int bnx2x_ets_e3b0_disabled(const struct link_params *params,
	struct bnx2x *bp = params->bp;		struct bnx2x *bp = params->bp;

	if (!CHIP_IS_E3B0(bp)) {		if (!CHIP_IS_E3B0(bp)) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_disabled the chip isn't E3B0"		DP(NETIF_MSG_LINK,
	"\n");		"bnx2x_ets_e3b0_disabled the chip isn't E3B0\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -854,8 +854,8 @@ static int bnx2x_ets_e3b0_get_total_bw(
	if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {		if (bnx2x_cos_state_bw == ets_params->cos[cos_idx].state) {

	if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {		if (0 == ets_params->cos[cos_idx].params.bw_params.bw) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config BW"		DP(NETIF_MSG_LINK,
	"was set to 0\n");		"bnx2x_ets_E3B0_config BW was set to 0\n");
	return -EINVAL;		return -EINVAL;
	}		}
	*total_bw +=		*total_bw +=
	@@ -866,12 +866,12 @@ static int bnx2x_ets_e3b0_get_total_bw(
	/Check taotl BW is valid /		/Check taotl BW is valid /
	if ((100 != total_bw) \|\| (0 == total_bw)) {		if ((100 != total_bw) \|\| (0 == total_bw)) {
	if (0 == *total_bw) {		if (0 == *total_bw) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW"		DP(NETIF_MSG_LINK,
	"shouldn't be 0\n");		"bnx2x_ets_E3B0_config toatl BW shouldn't be 0\n");
	return -EINVAL;		return -EINVAL;
	}		}
	DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config toatl BW should be"		DP(NETIF_MSG_LINK,
	"100\n");		"bnx2x_ets_E3B0_config toatl BW should be 100\n");
	/**		/**
	* We can handle a case whre the BW isn't 100 this can happen		* We can handle a case whre the BW isn't 100 this can happen
	* if the TC are joined.		* if the TC are joined.
	@@ -1090,8 +1090,8 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
	u8 cos_entry = 0;		u8 cos_entry = 0;

	if (!CHIP_IS_E3B0(bp)) {		if (!CHIP_IS_E3B0(bp)) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_disabled the chip isn't E3B0"		DP(NETIF_MSG_LINK,
	"\n");		"bnx2x_ets_e3b0_disabled the chip isn't E3B0\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -1108,8 +1108,8 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
	bnx2x_status = bnx2x_ets_e3b0_get_total_bw(params, ets_params,		bnx2x_status = bnx2x_ets_e3b0_get_total_bw(params, ets_params,
	&total_bw);		&total_bw);
	if (0 != bnx2x_status) {		if (0 != bnx2x_status) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config get_total_bw failed "		DP(NETIF_MSG_LINK,
	"\n");		"bnx2x_ets_E3B0_config get_total_bw failed\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -1144,13 +1144,13 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
	cos_entry);		cos_entry);

	} else {		} else {
	DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_config cos state not"		DP(NETIF_MSG_LINK,
	" valid\n");		"bnx2x_ets_e3b0_config cos state not valid\n");
	return -EINVAL;		return -EINVAL;
	}		}
	if (0 != bnx2x_status) {		if (0 != bnx2x_status) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_e3b0_config set cos bw "		DP(NETIF_MSG_LINK,
	"failed\n");		"bnx2x_ets_e3b0_config set cos bw failed\n");
	return bnx2x_status;		return bnx2x_status;
	}		}
	}		}
	@@ -1160,8 +1160,8 @@ int bnx2x_ets_e3b0_config(const struct link_params *params,
	sp_pri_to_cos);		sp_pri_to_cos);

	if (0 != bnx2x_status) {		if (0 != bnx2x_status) {
	DP(NETIF_MSG_LINK, "bnx2x_ets_E3B0_config set_pri_cli_reg "		DP(NETIF_MSG_LINK,
	"failed\n");		"bnx2x_ets_E3B0_config set_pri_cli_reg failed\n");
	return bnx2x_status;		return bnx2x_status;
	}		}

	@@ -1618,8 +1618,8 @@ static void bnx2x_xmac_init(struct bnx2x *bp, u32 max_speed)

	if (is_port4mode && (REG_RD(bp, MISC_REG_RESET_REG_2) &		if (is_port4mode && (REG_RD(bp, MISC_REG_RESET_REG_2) &
	MISC_REGISTERS_RESET_REG_2_XMAC)) {		MISC_REGISTERS_RESET_REG_2_XMAC)) {
	DP(NETIF_MSG_LINK, "XMAC already out of reset"		DP(NETIF_MSG_LINK,
	" in 4-port mode\n");		"XMAC already out of reset in 4-port mode\n");
	return;		return;
	}		}

	@@ -1642,13 +1642,13 @@ static void bnx2x_xmac_init(struct bnx2x *bp, u32 max_speed)
	/* Set the number of ports on the system side to 1 */		/* Set the number of ports on the system side to 1 */
	REG_WR(bp, MISC_REG_XMAC_CORE_PORT_MODE, 0);		REG_WR(bp, MISC_REG_XMAC_CORE_PORT_MODE, 0);
	if (max_speed == SPEED_10000) {		if (max_speed == SPEED_10000) {
	DP(NETIF_MSG_LINK, "Init XMAC to 10G x 1"		DP(NETIF_MSG_LINK,
	" port per path\n");		"Init XMAC to 10G x 1 port per path\n");
	/* Set the number of ports on the Warp Core to 10G */		/* Set the number of ports on the Warp Core to 10G */
	REG_WR(bp, MISC_REG_XMAC_PHY_PORT_MODE, 3);		REG_WR(bp, MISC_REG_XMAC_PHY_PORT_MODE, 3);
	} else {		} else {
	DP(NETIF_MSG_LINK, "Init XMAC to 20G x 2 ports"		DP(NETIF_MSG_LINK,
	" per path\n");		"Init XMAC to 20G x 2 ports per path\n");
	/* Set the number of ports on the Warp Core to 20G */		/* Set the number of ports on the Warp Core to 20G */
	REG_WR(bp, MISC_REG_XMAC_PHY_PORT_MODE, 1);		REG_WR(bp, MISC_REG_XMAC_PHY_PORT_MODE, 1);
	}		}
	@@ -3959,8 +3959,8 @@ static void bnx2x_warpcore_set_sgmii_speed(struct bnx2x_phy *phy,
	val16 \|= 0x0040;		val16 \|= 0x0040;
	break;		break;
	default:		default:
	DP(NETIF_MSG_LINK, "Speed not supported: 0x%x"		DP(NETIF_MSG_LINK,
	"\n", phy->req_line_speed);		"Speed not supported: 0x%x\n", phy->req_line_speed);
	return;		return;
	}		}

	@@ -4092,8 +4092,8 @@ static int bnx2x_get_mod_abs_int_cfg(struct bnx2x *bp,
	*/		*/
	if ((cfg_pin < PIN_CFG_GPIO0_P0) \|\|		if ((cfg_pin < PIN_CFG_GPIO0_P0) \|\|
	(cfg_pin > PIN_CFG_GPIO3_P1)) {		(cfg_pin > PIN_CFG_GPIO3_P1)) {
	DP(NETIF_MSG_LINK, "ERROR: Invalid cfg pin %x for "		DP(NETIF_MSG_LINK,
	"module detect indication\n",		"ERROR: Invalid cfg pin %x for module detect indication\n",
	cfg_pin);		cfg_pin);
	return -EINVAL;		return -EINVAL;
	}		}
	@@ -4222,8 +4222,9 @@ static void bnx2x_warpcore_config_init(struct bnx2x_phy *phy,
	break;		break;

	default:		default:
	DP(NETIF_MSG_LINK, "Unsupported Serdes Net Interface "		DP(NETIF_MSG_LINK,
	"0x%x\n", serdes_net_if);		"Unsupported Serdes Net Interface 0x%x\n",
			serdes_net_if);
	return;		return;
	}		}
	}		}
	@@ -6127,8 +6128,8 @@ static int bnx2x_link_initialize(struct link_params *params,
	if (phy_index == EXT_PHY2 &&		if (phy_index == EXT_PHY2 &&
	(bnx2x_phy_selection(params) ==		(bnx2x_phy_selection(params) ==
	PORT_HW_CFG_PHY_SELECTION_FIRST_PHY)) {		PORT_HW_CFG_PHY_SELECTION_FIRST_PHY)) {
	DP(NETIF_MSG_LINK, "Not initializing"		DP(NETIF_MSG_LINK,
	" second phy\n");		"Not initializing second phy\n");
	continue;		continue;
	}		}
	params->phy[phy_index].config_init(		params->phy[phy_index].config_init(
	@@ -6447,8 +6448,8 @@ int bnx2x_link_update(struct link_params params, struct link_vars vars)
	*/		*/
	if (active_external_phy == EXT_PHY1) {		if (active_external_phy == EXT_PHY1) {
	if (params->phy[EXT_PHY2].phy_specific_func) {		if (params->phy[EXT_PHY2].phy_specific_func) {
	DP(NETIF_MSG_LINK, "Disabling TX on"		DP(NETIF_MSG_LINK,
	" EXT_PHY2\n");		"Disabling TX on EXT_PHY2\n");
	params->phy[EXT_PHY2].phy_specific_func(		params->phy[EXT_PHY2].phy_specific_func(
	&params->phy[EXT_PHY2],		&params->phy[EXT_PHY2],
	params, DISABLE_TX);		params, DISABLE_TX);
	@@ -7341,8 +7342,8 @@ static int bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
	u16 val = 0;		u16 val = 0;
	u16 i;		u16 i;
	if (byte_cnt > 16) {		if (byte_cnt > 16) {
	DP(NETIF_MSG_LINK, "Reading from eeprom is"		DP(NETIF_MSG_LINK,
	" is limited to 0xf\n");		"Reading from eeprom is limited to 0xf\n");
	return -EINVAL;		return -EINVAL;
	}		}
	/* Set the read command byte count */		/* Set the read command byte count */
	@@ -7413,8 +7414,8 @@ static int bnx2x_warpcore_read_sfp_module_eeprom(struct bnx2x_phy *phy,
	" addr %d, cnt %d\n",		" addr %d, cnt %d\n",
	addr, byte_cnt);*/		addr, byte_cnt);*/
	if (byte_cnt > 16) {		if (byte_cnt > 16) {
	DP(NETIF_MSG_LINK, "Reading from eeprom is"		DP(NETIF_MSG_LINK,
	" is limited to 16 bytes\n");		"Reading from eeprom is limited to 16 bytes\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -7443,8 +7444,8 @@ static int bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
	u16 val, i;		u16 val, i;

	if (byte_cnt > 16) {		if (byte_cnt > 16) {
	DP(NETIF_MSG_LINK, "Reading from eeprom is"		DP(NETIF_MSG_LINK,
	" is limited to 0xf\n");		"Reading from eeprom is limited to 0xf\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -7591,13 +7592,14 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
	check_limiting_mode = 1;		check_limiting_mode = 1;
	} else if (copper_module_type &		} else if (copper_module_type &
	SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) {		SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) {
	DP(NETIF_MSG_LINK, "Passive Copper"		DP(NETIF_MSG_LINK,
	" cable detected\n");		"Passive Copper cable detected\n");
	*edc_mode =		*edc_mode =
	EDC_MODE_PASSIVE_DAC;		EDC_MODE_PASSIVE_DAC;
	} else {		} else {
	DP(NETIF_MSG_LINK, "Unknown copper-cable-"		DP(NETIF_MSG_LINK,
	"type 0x%x !!!\n", copper_module_type);		"Unknown copper-cable-type 0x%x !!!\n",
			copper_module_type);
	return -EINVAL;		return -EINVAL;
	}		}
	break;		break;
	@@ -7635,8 +7637,8 @@ static int bnx2x_get_edc_mode(struct bnx2x_phy *phy,
	SFP_EEPROM_OPTIONS_ADDR,		SFP_EEPROM_OPTIONS_ADDR,
	SFP_EEPROM_OPTIONS_SIZE,		SFP_EEPROM_OPTIONS_SIZE,
	options) != 0) {		options) != 0) {
	DP(NETIF_MSG_LINK, "Failed to read Option"		DP(NETIF_MSG_LINK,
	" field from module EEPROM\n");		"Failed to read Option field from module EEPROM\n");
	return -EINVAL;		return -EINVAL;
	}		}
	if ((options[0] & SFP_EEPROM_OPTIONS_LINEAR_RX_OUT_MASK))		if ((options[0] & SFP_EEPROM_OPTIONS_LINEAR_RX_OUT_MASK))
	@@ -7677,15 +7679,15 @@ static int bnx2x_verify_sfp_module(struct bnx2x_phy *phy,
	FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY) {		FEATURE_CONFIG_BC_SUPPORTS_OPT_MDL_VRFY) {
	/* Use first phy request only in case of non-dual media*/		/* Use first phy request only in case of non-dual media*/
	if (DUAL_MEDIA(params)) {		if (DUAL_MEDIA(params)) {
	DP(NETIF_MSG_LINK, "FW does not support OPT MDL "		DP(NETIF_MSG_LINK,
	"verification\n");		"FW does not support OPT MDL verification\n");
	return -EINVAL;		return -EINVAL;
	}		}
	cmd = DRV_MSG_CODE_VRFY_FIRST_PHY_OPT_MDL;		cmd = DRV_MSG_CODE_VRFY_FIRST_PHY_OPT_MDL;
	} else {		} else {
	/* No support in OPT MDL detection */		/* No support in OPT MDL detection */
	DP(NETIF_MSG_LINK, "FW does not support OPT MDL "		DP(NETIF_MSG_LINK,
	"verification\n");		"FW does not support OPT MDL verification\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -7736,8 +7738,9 @@ static int bnx2x_wait_for_sfp_module_initialized(struct bnx2x_phy *phy,
	for (timeout = 0; timeout < 60; timeout++) {		for (timeout = 0; timeout < 60; timeout++) {
	if (bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val)		if (bnx2x_read_sfp_module_eeprom(phy, params, 1, 1, &val)
	== 0) {		== 0) {
	DP(NETIF_MSG_LINK, "SFP+ module initialization "		DP(NETIF_MSG_LINK,
	"took %d ms\n", timeout * 5);		"SFP+ module initialization took %d ms\n",
			timeout * 5);
	return 0;		return 0;
	}		}
	msleep(5);		msleep(5);
	@@ -8506,8 +8509,8 @@ static int bnx2x_8726_config_init(struct bnx2x_phy *phy,
	/* Set TX PreEmphasis if needed */		/* Set TX PreEmphasis if needed */
	if ((params->feature_config_flags &		if ((params->feature_config_flags &
	FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED)) {		FEATURE_CONFIG_OVERRIDE_PREEMPHASIS_ENABLED)) {
	DP(NETIF_MSG_LINK, "Setting TX_CTRL1 0x%x,"		DP(NETIF_MSG_LINK,
	"TX_CTRL2 0x%x\n",		"Setting TX_CTRL1 0x%x, TX_CTRL2 0x%x\n",
	phy->tx_preemphasis[0],		phy->tx_preemphasis[0],
	phy->tx_preemphasis[1]);		phy->tx_preemphasis[1]);
	bnx2x_cl45_write(bp, phy,		bnx2x_cl45_write(bp, phy,
	@@ -8788,8 +8791,8 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,
	if (mod_abs & (1<<8)) {		if (mod_abs & (1<<8)) {

	/* Module is absent */		/* Module is absent */
	DP(NETIF_MSG_LINK, "MOD_ABS indication "		DP(NETIF_MSG_LINK,
	"show module is absent\n");		"MOD_ABS indication show module is absent\n");
	phy->media_type = ETH_PHY_NOT_PRESENT;		phy->media_type = ETH_PHY_NOT_PRESENT;
	/*		/*
	* 1. Set mod_abs to detect next module		* 1. Set mod_abs to detect next module
	@@ -8816,8 +8819,8 @@ static void bnx2x_8727_handle_mod_abs(struct bnx2x_phy *phy,

	} else {		} else {
	/* Module is present */		/* Module is present */
	DP(NETIF_MSG_LINK, "MOD_ABS indication "		DP(NETIF_MSG_LINK,
	"show module is present\n");		"MOD_ABS indication show module is present\n");
	/*		/*
	* First disable transmitter, and if the module is ok, the		* First disable transmitter, and if the module is ok, the
	* module_detection will enable it		* module_detection will enable it
	@@ -8908,8 +8911,9 @@ static u8 bnx2x_8727_read_status(struct bnx2x_phy *phy,
	if ((val1 & (1<<8)) == 0) {		if ((val1 & (1<<8)) == 0) {
	if (!CHIP_IS_E1x(bp))		if (!CHIP_IS_E1x(bp))
	oc_port = BP_PATH(bp) + (params->port << 1);		oc_port = BP_PATH(bp) + (params->port << 1);
	DP(NETIF_MSG_LINK, "8727 Power fault has been detected"		DP(NETIF_MSG_LINK,
	" on port %d\n", oc_port);		"8727 Power fault has been detected on port %d\n",
			oc_port);
	netdev_err(bp->dev, "Error: Power fault on Port %d has"		netdev_err(bp->dev, "Error: Power fault on Port %d has"
	" been detected and the power to "		" been detected and the power to "
	"that SFP+ module has been removed"		"that SFP+ module has been removed"
	@@ -9690,8 +9694,8 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
	MDIO_AN_REG_8481_EXPANSION_REG_RD_RW,		MDIO_AN_REG_8481_EXPANSION_REG_RD_RW,
	&legacy_status);		&legacy_status);

	DP(NETIF_MSG_LINK, "Legacy speed status"		DP(NETIF_MSG_LINK, "Legacy speed status = 0x%x\n",
	" = 0x%x\n", legacy_status);		legacy_status);
	link_up = ((legacy_status & (1<<11)) == (1<<11));		link_up = ((legacy_status & (1<<11)) == (1<<11));
	if (link_up) {		if (link_up) {
	legacy_speed = (legacy_status & (3<<9));		legacy_speed = (legacy_status & (3<<9));
	@@ -9709,8 +9713,9 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
	else		else
	vars->duplex = DUPLEX_HALF;		vars->duplex = DUPLEX_HALF;

	DP(NETIF_MSG_LINK, "Link is up in %dMbps,"		DP(NETIF_MSG_LINK,
	" is_duplex_full= %d\n", vars->line_speed,		"Link is up in %dMbps, is_duplex_full= %d\n",
			vars->line_speed,
	(vars->duplex == DUPLEX_FULL));		(vars->duplex == DUPLEX_FULL));
	/* Check legacy speed AN resolution */		/* Check legacy speed AN resolution */
	bnx2x_cl45_read(bp, phy,		bnx2x_cl45_read(bp, phy,
	@@ -10286,8 +10291,9 @@ static u8 bnx2x_54618se_read_status(struct bnx2x_phy *phy,
	} else /* Should not happen */		} else /* Should not happen */
	vars->line_speed = 0;		vars->line_speed = 0;

	DP(NETIF_MSG_LINK, "Link is up in %dMbps,"		DP(NETIF_MSG_LINK,
	" is_duplex_full= %d\n", vars->line_speed,		"Link is up in %dMbps, is_duplex_full= %d\n",
			vars->line_speed,
	(vars->duplex == DUPLEX_FULL));		(vars->duplex == DUPLEX_FULL));

	/* Check legacy speed AN resolution */		/* Check legacy speed AN resolution */
	@@ -11336,8 +11342,9 @@ static void bnx2x_phy_def_cfg(struct link_params *params,
	dev_info.		dev_info.
	port_hw_config[params->port].speed_capability_mask));		port_hw_config[params->port].speed_capability_mask));
	}		}
	DP(NETIF_MSG_LINK, "Default config phy idx %x cfg 0x%x speed_cap_mask"		DP(NETIF_MSG_LINK,
	" 0x%x\n", phy_index, link_config, phy->speed_cap_mask);		"Default config phy idx %x cfg 0x%x speed_cap_mask 0x%x\n",
			phy_index, link_config, phy->speed_cap_mask);

	phy->req_duplex = DUPLEX_FULL;		phy->req_duplex = DUPLEX_FULL;
	switch (link_config & PORT_FEATURE_LINK_SPEED_MASK) {		switch (link_config & PORT_FEATURE_LINK_SPEED_MASK) {

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

+16 −17

Original line number	Original line	Diff line number	Diff line
	@@ -4388,7 +4388,7 @@ static inline void bnx2x_handle_rx_mode_eqe(struct bnx2x *bp)
	static inline struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj(		static inline struct bnx2x_queue_sp_obj *bnx2x_cid_to_q_obj(
	struct bnx2x *bp, u32 cid)		struct bnx2x *bp, u32 cid)
	{		{
	DP(BNX2X_MSG_SP, "retrieving fp from cid %d", cid);		DP(BNX2X_MSG_SP, "retrieving fp from cid %d\n", cid);
	#ifdef BCM_CNIC		#ifdef BCM_CNIC
	if (cid == BNX2X_FCOE_ETH_CID)		if (cid == BNX2X_FCOE_ETH_CID)
	return &bnx2x_fcoe(bp, q_obj);		return &bnx2x_fcoe(bp, q_obj);
	@@ -7176,7 +7176,7 @@ static inline void bnx2x_pf_q_prep_init(struct bnx2x *bp,
	/* set maximum number of COSs supported by this queue */		/* set maximum number of COSs supported by this queue */
	init_params->max_cos = fp->max_cos;		init_params->max_cos = fp->max_cos;

	DP(BNX2X_MSG_SP, "fp: %d setting queue params max cos to: %d",		DP(BNX2X_MSG_SP, "fp: %d setting queue params max cos to: %d\n",
	fp->index, init_params->max_cos);		fp->index, init_params->max_cos);

	/* set the context pointers queue object */		/* set the context pointers queue object */
	@@ -7209,7 +7209,7 @@ int bnx2x_setup_tx_only(struct bnx2x bp, struct bnx2x_fastpath fp,

	DP(BNX2X_MSG_SP, "preparing to send tx-only ramrod for connection:"		DP(BNX2X_MSG_SP, "preparing to send tx-only ramrod for connection:"
	"cos %d, primary cid %d, cid %d, "		"cos %d, primary cid %d, cid %d, "
	"client id %d, sp-client id %d, flags %lx",		"client id %d, sp-client id %d, flags %lx\n",
	tx_index, q_params->q_obj->cids[FIRST_TX_COS_INDEX],		tx_index, q_params->q_obj->cids[FIRST_TX_COS_INDEX],
	q_params->q_obj->cids[tx_index], q_params->q_obj->cl_id,		q_params->q_obj->cids[tx_index], q_params->q_obj->cl_id,
	tx_only_params->gen_params.spcl_id, tx_only_params->flags);		tx_only_params->gen_params.spcl_id, tx_only_params->flags);
	@@ -7241,7 +7241,7 @@ int bnx2x_setup_queue(struct bnx2x bp, struct bnx2x_fastpath fp,
	int rc;		int rc;
	u8 tx_index;		u8 tx_index;

	DP(BNX2X_MSG_SP, "setting up queue %d", fp->index);		DP(BNX2X_MSG_SP, "setting up queue %d\n", fp->index);

	/* reset IGU state skip FCoE L2 queue */		/* reset IGU state skip FCoE L2 queue */
	if (!IS_FCOE_FP(fp))		if (!IS_FCOE_FP(fp))
	@@ -7265,7 +7265,7 @@ int bnx2x_setup_queue(struct bnx2x bp, struct bnx2x_fastpath fp,
	return rc;		return rc;
	}		}

	DP(BNX2X_MSG_SP, "init complete");		DP(BNX2X_MSG_SP, "init complete\n");


	/* Now move the Queue to the SETUP state... */		/* Now move the Queue to the SETUP state... */
	@@ -7319,7 +7319,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
	struct bnx2x_queue_state_params q_params = {0};		struct bnx2x_queue_state_params q_params = {0};
	int rc, tx_index;		int rc, tx_index;

	DP(BNX2X_MSG_SP, "stopping queue %d cid %d", index, fp->cid);		DP(BNX2X_MSG_SP, "stopping queue %d cid %d\n", index, fp->cid);

	q_params.q_obj = &fp->q_obj;		q_params.q_obj = &fp->q_obj;
	/* We want to wait for completion in this context */		/* We want to wait for completion in this context */
	@@ -7334,7 +7334,7 @@ static int bnx2x_stop_queue(struct bnx2x *bp, int index)
	/* ascertain this is a normal queue*/		/* ascertain this is a normal queue*/
	txdata = &fp->txdata[tx_index];		txdata = &fp->txdata[tx_index];

	DP(BNX2X_MSG_SP, "stopping tx-only queue %d",		DP(BNX2X_MSG_SP, "stopping tx-only queue %d\n",
	txdata->txq_index);		txdata->txq_index);

	/* send halt terminate on tx-only connection */		/* send halt terminate on tx-only connection */
	@@ -10704,7 +10704,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
	return rc;		return rc;
	}		}

	DP(NETIF_MSG_DRV, "max_non_def_sbs %d", max_non_def_sbs);		DP(NETIF_MSG_DRV, "max_non_def_sbs %d\n", max_non_def_sbs);

	rc = bnx2x_init_bp(bp);		rc = bnx2x_init_bp(bp);
	if (rc)		if (rc)
	@@ -10759,15 +10759,14 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,

	bnx2x_get_pcie_width_speed(bp, &pcie_width, &pcie_speed);		bnx2x_get_pcie_width_speed(bp, &pcie_width, &pcie_speed);

	netdev_info(dev, "%s (%c%d) PCI-E x%d %s found at mem %lx,"		netdev_info(dev, "%s (%c%d) PCI-E x%d %s found at mem %lx, IRQ %d, node addr %pM\n",
	" IRQ %d, ", board_info[ent->driver_data].name,		board_info[ent->driver_data].name,
	(CHIP_REV(bp) >> 12) + 'A', (CHIP_METAL(bp) >> 4),		(CHIP_REV(bp) >> 12) + 'A', (CHIP_METAL(bp) >> 4),
	pcie_width,		pcie_width,
	((!CHIP_IS_E2(bp) && pcie_speed == 2) \|\|		((!CHIP_IS_E2(bp) && pcie_speed == 2) \|\|
	(CHIP_IS_E2(bp) && pcie_speed == 1)) ?		(CHIP_IS_E2(bp) && pcie_speed == 1)) ?
	"5GHz (Gen2)" : "2.5GHz",		"5GHz (Gen2)" : "2.5GHz",
	dev->base_addr, bp->pdev->irq);		dev->base_addr, bp->pdev->irq, dev->dev_addr);
	pr_cont("node addr %pM\n", dev->dev_addr);

	return 0;		return 0;