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

Commit 805cedd6 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: Add support to retrieve and store LED link active 



This patch adds support to get the LED link active via the LEDCTL
register.  If the LEDCTL register does not have LED link active
(LED mode field = 0x0100) set then default LED link active returned.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0c1b7de4

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+1 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ static const struct ixgbe_mac_operations mac_ops_82598 = { 
	.get_link_capabilities	= &ixgbe_get_link_capabilities_82598,

	.led_on			= &ixgbe_led_on_generic,

	.led_off		= &ixgbe_led_off_generic,

	.init_led_link_act	= ixgbe_init_led_link_act_generic,

	.blink_led_start	= &ixgbe_blink_led_start_generic,

	.blink_led_stop		= &ixgbe_blink_led_stop_generic,

	.set_rar		= &ixgbe_set_rar_generic,

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+1 −0
Original line number Diff line number Diff line
@@ -2204,6 +2204,7 @@ static const struct ixgbe_mac_operations mac_ops_82599 = { 
	.get_link_capabilities  = &ixgbe_get_link_capabilities_82599,

	.led_on                 = &ixgbe_led_on_generic,

	.led_off                = &ixgbe_led_off_generic,

	.init_led_link_act	= ixgbe_init_led_link_act_generic,

	.blink_led_start        = &ixgbe_blink_led_start_generic,

	.blink_led_stop         = &ixgbe_blink_led_stop_generic,

	.set_rar                = &ixgbe_set_rar_generic,

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+46 −0
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw) 
		status = hw->mac.ops.start_hw(hw);

	}



	/* Initialize the LED link active for LED blink support */

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



	return status;

}
@@ -772,6 +775,49 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw) 
	return ixgbe_disable_pcie_master(hw);

}



/**

 *  ixgbe_init_led_link_act_generic - Store the LED index link/activity.

 *  @hw: pointer to hardware structure

 *

 *  Store the index for the link active LED. This will be used to support

 *  blinking the LED.

 **/

s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw)

{

	struct ixgbe_mac_info *mac = &hw->mac;

	u32 led_reg, led_mode;

	u16 i;



	led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	/* Get LED link active from the LEDCTL register */

	for (i = 0; i < 4; i++) {

		led_mode = led_reg >> IXGBE_LED_MODE_SHIFT(i);



		if ((led_mode & IXGBE_LED_MODE_MASK_BASE) ==

		    IXGBE_LED_LINK_ACTIVE) {

			mac->led_link_act = i;

			return 0;

		}

	}



	/* If LEDCTL register does not have the LED link active set, then use

	 * known MAC defaults.

	 */

	switch (hw->mac.type) {

	case ixgbe_mac_x550em_a:

		mac->led_link_act = 0;

		break;

	case ixgbe_mac_X550EM_x:

		mac->led_link_act = 1;

		break;

	default:

		mac->led_link_act = 2;

	}



	return 0;

}



/**

 *  ixgbe_led_on_generic - Turns on the software controllable LEDs.

 *  @hw: pointer to hardware structure

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw); 


s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);

s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw);



s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);

s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data);

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -2225,11 +2225,11 @@ static int ixgbe_set_phys_id(struct net_device *netdev, 
		return 2;



	case ETHTOOL_ID_ON:

		hw->mac.ops.led_on(hw, hw->bus.func);

		hw->mac.ops.led_on(hw, hw->mac.led_link_act);

		break;



	case ETHTOOL_ID_OFF:

		hw->mac.ops.led_off(hw, hw->bus.func);

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

		break;



	case ETHTOOL_ID_INACTIVE: