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

Commit dbf80dcb authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: implement ethtool set_phys_id 



Based on a patch from Stephen Hemminger <shemminger@vyatta.com>.

The new ethtool set_phys_id takes over controlling the LED for
identifying boards.  This fixes the lockout during that period.
For this device lots of extra infrastructure can also be removed by
using set_phys_id.

v2: - return blink frequency for parts that do not support blink in h/w
    - add blink_led function pointers for devices that do support blink
      in h/w to cleanup the test for this functionality

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2bd93d7a

drivers/net/e1000e/82571.c

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) 
		func->set_lan_id = e1000_set_lan_id_single_port;

		func->check_mng_mode = e1000e_check_mng_mode_generic;

		func->led_on = e1000e_led_on_generic;

		func->blink_led = e1000e_blink_led_generic;



		/* FWSM register */

		mac->has_fwsm = true;
@@ -320,6 +321,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) 
	default:

		func->check_mng_mode = e1000e_check_mng_mode_generic;

		func->led_on = e1000e_led_on_generic;

		func->blink_led = e1000e_blink_led_generic;



		/* FWSM register */

		mac->has_fwsm = true;

drivers/net/e1000e/e1000.h

+1 −5
Original line number Diff line number Diff line
@@ -391,13 +391,10 @@ struct e1000_adapter { 


	bool fc_autoneg;



	unsigned long led_status;



	unsigned int flags;

	unsigned int flags2;

	struct work_struct downshift_task;

	struct work_struct update_phy_task;

	struct work_struct led_blink_task;

	struct work_struct print_hang_task;



	bool idle_check;
@@ -487,7 +484,6 @@ extern const char e1000e_driver_version[]; 


extern void e1000e_check_options(struct e1000_adapter *adapter);

extern void e1000e_set_ethtool_ops(struct net_device *netdev);

extern void e1000e_led_blink_task(struct work_struct *work);



extern int e1000e_up(struct e1000_adapter *adapter);

extern void e1000e_down(struct e1000_adapter *adapter);
@@ -575,7 +571,7 @@ extern s32 e1000e_valid_led_default(struct e1000_hw *hw, u16 *data); 
extern void e1000e_config_collision_dist(struct e1000_hw *hw);

extern s32 e1000e_config_fc_after_link_up(struct e1000_hw *hw);

extern s32 e1000e_force_mac_fc(struct e1000_hw *hw);

extern s32 e1000e_blink_led(struct e1000_hw *hw);

extern s32 e1000e_blink_led_generic(struct e1000_hw *hw);

extern void e1000_write_vfta_generic(struct e1000_hw *hw, u32 offset, u32 value);

extern s32 e1000_check_alt_mac_addr_generic(struct e1000_hw *hw);

extern void e1000e_reset_adaptive(struct e1000_hw *hw);

drivers/net/e1000e/es2lan.c

+1 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) 
static struct e1000_mac_operations es2_mac_ops = {

	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,

	.id_led_init		= e1000e_id_led_init,

	.blink_led		= e1000e_blink_led_generic,

	.check_mng_mode		= e1000e_check_mng_mode_generic,

	/* check_for_link dependent on media type */

	.cleanup_led		= e1000e_cleanup_led_generic,

drivers/net/e1000e/ethtool.c

+21 −50
Original line number Diff line number Diff line
@@ -1851,64 +1851,35 @@ static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	return 0;

}



/* toggle LED 4 times per second = 2 "blinks" per second */

#define E1000_ID_INTERVAL	(HZ/4)



/* bit defines for adapter->led_status */

#define E1000_LED_ON		0



void e1000e_led_blink_task(struct work_struct *work)

{

	struct e1000_adapter *adapter = container_of(work,

	                                struct e1000_adapter, led_blink_task);



	if (test_and_change_bit(E1000_LED_ON, &adapter->led_status))

		adapter->hw.mac.ops.led_off(&adapter->hw);

	else

		adapter->hw.mac.ops.led_on(&adapter->hw);

}



static void e1000_led_blink_callback(unsigned long data)

{

	struct e1000_adapter *adapter = (struct e1000_adapter *) data;



	schedule_work(&adapter->led_blink_task);

	mod_timer(&adapter->blink_timer, jiffies + E1000_ID_INTERVAL);

}



static int e1000_phys_id(struct net_device *netdev, u32 data)

static int e1000_set_phys_id(struct net_device *netdev,

			     enum ethtool_phys_id_state state)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;



	if (!data)

		data = INT_MAX;

	switch (state) {

	case ETHTOOL_ID_ACTIVE:

		if (!hw->mac.ops.blink_led)

			return 2;	/* cycle on/off twice per second */



	if ((hw->phy.type == e1000_phy_ife) ||

	    (hw->mac.type == e1000_pchlan) ||

	    (hw->mac.type == e1000_pch2lan) ||

	    (hw->mac.type == e1000_82583) ||

	    (hw->mac.type == e1000_82574)) {

		if (!adapter->blink_timer.function) {

			init_timer(&adapter->blink_timer);

			adapter->blink_timer.function =

				e1000_led_blink_callback;

			adapter->blink_timer.data = (unsigned long) adapter;

		}

		mod_timer(&adapter->blink_timer, jiffies);

		msleep_interruptible(data * 1000);

		del_timer_sync(&adapter->blink_timer);

		hw->mac.ops.blink_led(hw);

		break;



	case ETHTOOL_ID_INACTIVE:

		if (hw->phy.type == e1000_phy_ife)

			e1e_wphy(hw, IFE_PHY_SPECIAL_CONTROL_LED, 0);

	} else {

		e1000e_blink_led(hw);

		msleep_interruptible(data * 1000);

	}



		hw->mac.ops.led_off(hw);

	clear_bit(E1000_LED_ON, &adapter->led_status);

		hw->mac.ops.cleanup_led(hw);

		break;



	case ETHTOOL_ID_ON:

		adapter->hw.mac.ops.led_on(&adapter->hw);

		break;



	case ETHTOOL_ID_OFF:

		adapter->hw.mac.ops.led_off(&adapter->hw);

		break;

	}

	return 0;

}
@@ -2074,7 +2045,7 @@ static const struct ethtool_ops e1000_ethtool_ops = { 
	.set_tso		= e1000_set_tso,

	.self_test		= e1000_diag_test,

	.get_strings		= e1000_get_strings,

	.phys_id		= e1000_phys_id,

	.set_phys_id		= e1000_set_phys_id,

	.get_ethtool_stats	= e1000_get_ethtool_stats,

	.get_sset_count		= e1000e_get_sset_count,

	.get_coalesce		= e1000_get_coalesce,

drivers/net/e1000e/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -756,6 +756,7 @@ struct e1000_host_mng_command_info { 
/* Function pointers and static data for the MAC. */

struct e1000_mac_operations {

	s32  (*id_led_init)(struct e1000_hw *);

	s32  (*blink_led)(struct e1000_hw *);

	bool (*check_mng_mode)(struct e1000_hw *);

	s32  (*check_for_link)(struct e1000_hw *);

	s32  (*cleanup_led)(struct e1000_hw *);