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

Commit 003287e0 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbevf: Correct parameter sent to LED function 



The second parameter of these functions is the index to the led we
are interested in affecting.  However we were mistakenly passing
the offset in the register.  This patch corrects that and adds some
bonds checking which would hopefully make bugs like this more noticeable
in the future.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fc355e07

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

+12 −0
Original line number Diff line number Diff line
@@ -763,6 +763,9 @@ s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index) 
{

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	if (index > 3)

		return IXGBE_ERR_PARAM;



	/* To turn on the LED, set mode to ON. */

	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg |= IXGBE_LED_ON << IXGBE_LED_MODE_SHIFT(index);
@@ -781,6 +784,9 @@ s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index) 
{

	u32 led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);



	if (index > 3)

		return IXGBE_ERR_PARAM;



	/* To turn off the LED, set mode to OFF. */

	led_reg &= ~IXGBE_LED_MODE_MASK(index);

	led_reg |= IXGBE_LED_OFF << IXGBE_LED_MODE_SHIFT(index);
@@ -2698,6 +2704,9 @@ s32 ixgbe_blink_led_start_generic(struct ixgbe_hw *hw, u32 index) 
	bool locked = false;

	s32 ret_val;



	if (index > 3)

		return IXGBE_ERR_PARAM;



	/*

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

	 * Force it if link is down.
@@ -2741,6 +2750,9 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index) 
	bool locked = false;

	s32 ret_val;



	if (index > 3)

		return IXGBE_ERR_PARAM;



	ret_val = hw->mac.ops.prot_autoc_read(hw, &locked, &autoc_reg);

	if (ret_val)

		return ret_val;

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

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



	case ETHTOOL_ID_ON:

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

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

		break;



	case ETHTOOL_ID_OFF:

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

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

		break;



	case ETHTOOL_ID_INACTIVE: