Commit 84ae48fe authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

sfc: Restore phy_flash_cfg module parameter 



This is needed for recovery in case a PHY firmware upgrade is aborted.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2f7f5730

drivers/net/sfc/efx.c

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,10 @@ static unsigned int rss_cpus; 
module_param(rss_cpus, uint, 0444);

MODULE_PARM_DESC(rss_cpus, "Number of CPUs to use for Receive-Side Scaling");



static int phy_flash_cfg;

module_param(phy_flash_cfg, int, 0644);

MODULE_PARM_DESC(phy_flash_cfg, "Set PHYs into reflash mode initially");



/**************************************************************************

 *

 * Utility functions and prototypes
@@ -609,6 +613,9 @@ static int efx_probe_port(struct efx_nic *efx) 
	if (rc)

		goto err;



	if (phy_flash_cfg)

		efx->phy_mode = PHY_MODE_SPECIAL;



	/* Sanity check MAC address */

	if (is_valid_ether_addr(efx->mac_address)) {

		memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);