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

Commit 87c12017 authored by PJ Waskiewicz's avatar PJ Waskiewicz Committed by David S. Miller
Browse files

ixgbe: Move the LED blink code to common, since 82599 also uses it 



The LED blink code is common for 82599 as well.  It should be moved to
ixgbe_common.c so both devices can use it, and not have it duplicated.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d543103a

drivers/net/ixgbe/ixgbe_82598.c

+2 −57
Original line number Diff line number Diff line
@@ -884,61 +884,6 @@ static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw) 
	return 0;

}



/**

 *  ixgbe_blink_led_start_82598 - Blink LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to blink

 **/

static s32 ixgbe_blink_led_start_82598(struct ixgbe_hw *hw, u32 index)

{

	ixgbe_link_speed speed = 0;

	bool link_up = 0;

	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	/*

	 * Link must be up to auto-blink the LEDs on the 82598EB MAC;

	 * force it if link is down.

	 */

	hw->mac.ops.check_link(hw, &speed, &link_up, false);



	if (!link_up) {

		autoc_reg |= IXGBE_AUTOC_FLU;

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);

		msleep(10);

	}



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg |= IXGBE_LED_BLINK(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}



/**

 *  ixgbe_blink_led_stop_82598 - Stop blinking LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to stop blinking

 **/

static s32 ixgbe_blink_led_stop_82598(struct ixgbe_hw *hw, u32 index)

{

	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	autoc_reg &= ~IXGBE_AUTOC_FLU;

	autoc_reg |= IXGBE_AUTOC_AN_RESTART;

	IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg &= ~IXGBE_LED_BLINK(index);

	led_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}



/**

 *  ixgbe_read_analog_reg8_82598 - Reads 8 bit Atlas analog register

 *  @hw: pointer to hardware structure
@@ -1128,8 +1073,8 @@ static 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,

	.blink_led_start	= &ixgbe_blink_led_start_82598,

	.blink_led_stop		= &ixgbe_blink_led_stop_82598,

	.blink_led_start	= &ixgbe_blink_led_start_generic,

	.blink_led_stop		= &ixgbe_blink_led_stop_generic,

	.set_rar		= &ixgbe_set_rar_generic,

	.clear_rar		= &ixgbe_clear_rar_generic,

	.set_vmdq		= &ixgbe_set_vmdq_82598,

drivers/net/ixgbe/ixgbe_82599.c

+2 −38
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ s32 ixgbe_clear_vmdq_82599(struct ixgbe_hw *hw, u32 rar, u32 vmdq); 
s32 ixgbe_set_vfta_82599(struct ixgbe_hw *hw, u32 vlan,

                         u32 vind, bool vlan_on);

s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw);

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

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

s32 ixgbe_init_uta_tables_82599(struct ixgbe_hw *hw);

s32 ixgbe_read_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 *val);

s32 ixgbe_write_analog_reg8_82599(struct ixgbe_hw *hw, u32 reg, u8 val);
@@ -990,40 +988,6 @@ s32 ixgbe_clear_vfta_82599(struct ixgbe_hw *hw) 
	return 0;

}



/**

 *  ixgbe_blink_led_start_82599 - Blink LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to blink

 **/

s32 ixgbe_blink_led_start_82599(struct ixgbe_hw *hw, u32 index)

{

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg |= IXGBE_LED_BLINK(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}



/**

 *  ixgbe_blink_led_stop_82599 - Stop blinking LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to stop blinking

 **/

s32 ixgbe_blink_led_stop_82599(struct ixgbe_hw *hw, u32 index)

{

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg &= ~IXGBE_LED_BLINK(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}



/**

 *  ixgbe_init_uta_tables_82599 - Initialize the Unicast Table Array

 *  @hw: pointer to hardware structure
@@ -1243,8 +1207,8 @@ static 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,

	.blink_led_start        = &ixgbe_blink_led_start_82599,

	.blink_led_stop         = &ixgbe_blink_led_stop_82599,

	.blink_led_start        = &ixgbe_blink_led_start_generic,

	.blink_led_stop         = &ixgbe_blink_led_stop_generic,

	.set_rar                = &ixgbe_set_rar_generic,

	.clear_rar              = &ixgbe_clear_rar_generic,

	.set_vmdq               = &ixgbe_set_vmdq_82599,

drivers/net/ixgbe/ixgbe_common.c

+55 −0
Original line number Diff line number Diff line
@@ -2071,3 +2071,58 @@ s32 ixgbe_enable_rx_dma_generic(struct ixgbe_hw *hw, u32 regval) 


	return 0;

}



/**

 *  ixgbe_blink_led_start_generic - Blink LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to blink

 **/

s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index)

{

	ixgbe_link_speed speed = 0;

	bool link_up = 0;

	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	/*

	 * Link must be up to auto-blink the LEDs;

	 * Force it if link is down.

	 */

	hw->mac.ops.check_link(hw, &speed, &link_up, false);



	if (!link_up) {

		autoc_reg |= IXGBE_AUTOC_FLU;

		IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);

		msleep(10);

	}



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg |= IXGBE_LED_BLINK(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}



/**

 *  ixgbe_blink_led_stop_generic - Stop blinking LED based on index.

 *  @hw: pointer to hardware structure

 *  @index: led number to stop blinking

 **/

s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index)

{

	u32 autoc_reg = IXGBE_READ_REG(hw, IXGBE_AUTOC);

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	autoc_reg &= ~IXGBE_AUTOC_FLU;

	autoc_reg |= IXGBE_AUTOC_AN_RESTART;

	IXGBE_WRITE_REG(hw, IXGBE_AUTOC, autoc_reg);



	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg &= ~IXGBE_LED_BLINK(index);

	led_reg |= IXGBE_LED_LINK_ACTIVE << IXGBE_LED_MODE_SHIFT(index);

	IXGBE_WRITE_REG(hw, IXGBE_LEDCTL, led_reg);

	IXGBE_WRITE_FLUSH(hw);



	return 0;

}

drivers/net/ixgbe/ixgbe_common.h

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ s32 ixgbe_disable_pcie_master(struct ixgbe_hw *hw); 
s32 ixgbe_read_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 *val);

s32 ixgbe_write_analog_reg8_generic(struct ixgbe_hw *hw, u32 reg, u8 val);



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

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



#define IXGBE_WRITE_REG(a, reg, value) writel((value), ((a)->hw_addr + (reg)))



#ifndef writeq