Commit 5d07d868 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Utilize Link Flap Avoidance 



Change various flows in the bnx2x driver which up until now flapped
the link - these flows now benefit from the link flap avoidance mechanism.

This includes the removal of the link reset made upon nic init, as it is
possible the link is already active at that time.

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarYaniv Rosner <yaniv.rosner@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3a8f13b

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

+6 −6
Original line number Diff line number Diff line
@@ -2283,7 +2283,7 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode) 
	/* Wait for all pending SP commands to complete */

	if (!bnx2x_wait_sp_comp(bp, ~0x0UL)) {

		BNX2X_ERR("Timeout waiting for SP elements to complete\n");

		bnx2x_nic_unload(bp, UNLOAD_CLOSE);

		bnx2x_nic_unload(bp, UNLOAD_CLOSE, false);

		return -EBUSY;

	}
@@ -2331,7 +2331,7 @@ load_error0: 
}



/* must be called with rtnl_lock */

int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode)

int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link)

{

	int i;

	bool global = false;
@@ -2393,7 +2393,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) 


	/* Cleanup the chip if needed */

	if (unload_mode != UNLOAD_RECOVERY)

		bnx2x_chip_cleanup(bp, unload_mode);

		bnx2x_chip_cleanup(bp, unload_mode, keep_link);

	else {

		/* Send the UNLOAD_REQUEST to the MCP */

		bnx2x_send_unload_req(bp, unload_mode);
@@ -2417,7 +2417,7 @@ int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) 
		bnx2x_free_irq(bp);



		/* Report UNLOAD_DONE to MCP */

		bnx2x_send_unload_done(bp);

		bnx2x_send_unload_done(bp, false);

	}



	/*
@@ -3768,7 +3768,7 @@ int bnx2x_reload_if_running(struct net_device *dev) 
	if (unlikely(!netif_running(dev)))

		return 0;



	bnx2x_nic_unload(bp, UNLOAD_NORMAL);

	bnx2x_nic_unload(bp, UNLOAD_NORMAL, true);

	return bnx2x_nic_load(bp, LOAD_NORMAL);

}
@@ -3965,7 +3965,7 @@ int bnx2x_suspend(struct pci_dev *pdev, pm_message_t state) 


	netif_device_detach(dev);



	bnx2x_nic_unload(bp, UNLOAD_CLOSE);

	bnx2x_nic_unload(bp, UNLOAD_CLOSE, false);



	bnx2x_set_power_state(bp, pci_choose_state(pdev, state));

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

+13 −3
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ u32 bnx2x_send_unload_req(struct bnx2x *bp, int unload_mode); 
 * bnx2x_send_unload_done - send UNLOAD_DONE command to the MCP.

 *

 * @bp:		driver handle

 * @keep_link:		true iff link should be kept up

 */

void bnx2x_send_unload_done(struct bnx2x *bp);

void bnx2x_send_unload_done(struct bnx2x *bp, bool keep_link);



/**

 * bnx2x_config_rss_pf - configure RSS parameters in a PF.
@@ -152,6 +153,14 @@ u8 bnx2x_initial_phy_init(struct bnx2x *bp, int load_mode); 
 */

void bnx2x_link_set(struct bnx2x *bp);



/**

 * bnx2x_force_link_reset - Forces link reset, and put the PHY

 * in reset as well.

 *

 * @bp:		driver handle

 */

void bnx2x_force_link_reset(struct bnx2x *bp);



/**

 * bnx2x_link_test - query link status.

 *
@@ -312,12 +321,13 @@ void bnx2x_set_num_queues(struct bnx2x *bp); 
 *

 * @bp:			driver handle

 * @unload_mode:	COMMON, PORT, FUNCTION

 * @keep_link:		true iff link should be kept up.

 *

 * - Cleanup MAC configuration.

 * - Closes clients.

 * - etc.

 */

void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode);

void bnx2x_chip_cleanup(struct bnx2x *bp, int unload_mode, bool keep_link);



/**

 * bnx2x_acquire_hw_lock - acquire HW lock.
@@ -446,7 +456,7 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl); 
bool bnx2x_test_firmware_version(struct bnx2x *bp, bool is_err);



/* dev_close main block */

int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode);

int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode, bool keep_link);



/* dev_open main block */

int bnx2x_nic_load(struct bnx2x *bp, int load_mode);

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

+6 −4
Original line number Diff line number Diff line
@@ -905,6 +905,7 @@ static int bnx2x_nway_reset(struct net_device *dev) 


	if (netif_running(dev)) {

		bnx2x_stats_handle(bp, STATS_EVENT_STOP);

		bnx2x_force_link_reset(bp);

		bnx2x_link_set(bp);

	}
@@ -1733,6 +1734,7 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	/* Restart link to propogate changes */

	if (netif_running(dev)) {

		bnx2x_stats_handle(bp, STATS_EVENT_STOP);

		bnx2x_force_link_reset(bp);

		bnx2x_link_set(bp);

	}
@@ -2257,7 +2259,7 @@ static int bnx2x_test_ext_loopback(struct bnx2x *bp) 
	if (!netif_running(bp->dev))

		return BNX2X_EXT_LOOPBACK_FAILED;



	bnx2x_nic_unload(bp, UNLOAD_NORMAL);

	bnx2x_nic_unload(bp, UNLOAD_NORMAL, false);

	rc = bnx2x_nic_load(bp, LOAD_LOOPBACK_EXT);

	if (rc) {

		DP(BNX2X_MSG_ETHTOOL,
@@ -2408,7 +2410,7 @@ static void bnx2x_self_test(struct net_device *dev, 


		link_up = bp->link_vars.link_up;



		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		bnx2x_nic_unload(bp, UNLOAD_NORMAL, false);

		rc = bnx2x_nic_load(bp, LOAD_DIAG);

		if (rc) {

			etest->flags |= ETH_TEST_FL_FAILED;
@@ -2440,7 +2442,7 @@ static void bnx2x_self_test(struct net_device *dev, 
			etest->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE;

		}



		bnx2x_nic_unload(bp, UNLOAD_NORMAL);

		bnx2x_nic_unload(bp, UNLOAD_NORMAL, false);



		/* restore input for TX port IF */

		REG_WR(bp, NIG_REG_EGRESS_UMP0_IN_EN + port*4, val);
@@ -2934,7 +2936,7 @@ static int bnx2x_set_channels(struct net_device *dev, 
		bnx2x_change_num_queues(bp, channels->combined_count);

		return 0;

	}

	bnx2x_nic_unload(bp, UNLOAD_NORMAL);

	bnx2x_nic_unload(bp, UNLOAD_NORMAL, true);

	bnx2x_change_num_queues(bp, channels->combined_count);

	return bnx2x_nic_load(bp, LOAD_NORMAL);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -1286,6 +1286,9 @@ struct drv_func_mb { 
	#define DRV_MSG_CODE_SET_MF_BW_MIN_MASK         0x00ff0000

	#define DRV_MSG_CODE_SET_MF_BW_MAX_MASK         0xff000000



	#define DRV_MSG_CODE_UNLOAD_SKIP_LINK_RESET     0x00000002



	#define DRV_MSG_CODE_LOAD_REQ_WITH_LFA          0x0000100a

	u32 fw_mb_header;

	#define FW_MSG_CODE_MASK                        0xffff0000

	#define FW_MSG_CODE_DRV_LOAD_COMMON             0x10100000

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

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ int bnx2x_phy_init(struct link_params *params, struct link_vars *vars); 
   to 0 */

int bnx2x_link_reset(struct link_params *params, struct link_vars *vars,

		     u8 reset_ext_phy);



int bnx2x_lfa_reset(struct link_params *params, struct link_vars *vars);

/* bnx2x_link_update should be called upon link interrupt */

int bnx2x_link_update(struct link_params *params, struct link_vars *vars);

CRA Git | Maintained and supported by SUSTech CRA and CCSE