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

Commit 6f8b9160 authored by Akeem G. Abodunrin's avatar Akeem G. Abodunrin Committed by Jeff Kirsher
Browse files

igb: Implementation of i210/i211 LED support 



This patch fixes LED issues with i210 and i211 devices, due to changes in the
device registers.

Signed-off-by: default avatarAkeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 41f149a2

drivers/net/ethernet/intel/igb/e1000_i210.h

+3 −3
Original line number Diff line number Diff line
@@ -82,11 +82,11 @@ enum E1000_INVM_STRUCTURE_TYPE { 
#define E1000_INVM_MAJOR_SHIFT		4



#define ID_LED_DEFAULT_I210		((ID_LED_OFF1_ON2  << 8) | \

					 (ID_LED_OFF1_OFF2 <<  4) | \

					 (ID_LED_DEF1_DEF2))

					 (ID_LED_DEF1_DEF2 <<  4) | \

					 (ID_LED_OFF1_OFF2))

#define ID_LED_DEFAULT_I210_SERDES	((ID_LED_DEF1_DEF2 << 8) | \

					 (ID_LED_DEF1_DEF2 <<  4) | \

					 (ID_LED_DEF1_DEF2))

					 (ID_LED_OFF1_ON2))



/* NVM offset defaults for i211 device */

#define NVM_INIT_CTRL_2_DEFAULT_I211	0X7243

drivers/net/ethernet/intel/igb/e1000_mac.c

+7 −1
Original line number Diff line number Diff line
@@ -1332,7 +1332,13 @@ s32 igb_id_led_init(struct e1000_hw *hw) 
	u16 data, i, temp;

	const u16 led_mask = 0x0F;



	/* i210 and i211 devices have different LED mechanism */

	if ((hw->mac.type == e1000_i210) ||

	    (hw->mac.type == e1000_i211))

		ret_val = igb_valid_led_default_i210(hw, &data);

	else

		ret_val = igb_valid_led_default(hw, &data);



	if (ret_val)

		goto out;