leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

igb: Implementation of i210/i211 LED support

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

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Akeem G. Abodunrin 2013-05-01 05:44:45 +00:00 committed by Jeff Kirsher
parent 41f149a285
commit 6f8b916065
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/intel/igb/e1000_i210.h
View File

@ -82,11 +82,11 @@ enum E1000_INVM_STRUCTURE_TYPE {
#define E1000_INVM_MAJOR_SHIFT 4 #define E1000_INVM_MAJOR_SHIFT 4
#define ID_LED_DEFAULT_I210 ((ID_LED_OFF1_ON2 << 8) | \ #define ID_LED_DEFAULT_I210 ((ID_LED_OFF1_ON2 << 8) | \
(ID_LED_OFF1_OFF2 << 4) | \ (ID_LED_DEF1_DEF2 << 4) | \
(ID_LED_DEF1_DEF2)) (ID_LED_OFF1_OFF2))
#define ID_LED_DEFAULT_I210_SERDES ((ID_LED_DEF1_DEF2 << 8) | \ #define ID_LED_DEFAULT_I210_SERDES ((ID_LED_DEF1_DEF2 << 8) | \
(ID_LED_DEF1_DEF2 << 4) | \ (ID_LED_DEF1_DEF2 << 4) | \
(ID_LED_DEF1_DEF2)) (ID_LED_OFF1_ON2))
/* NVM offset defaults for i211 device */ /* NVM offset defaults for i211 device */
#define NVM_INIT_CTRL_2_DEFAULT_I211 0X7243 #define NVM_INIT_CTRL_2_DEFAULT_I211 0X7243

8
drivers/net/ethernet/intel/igb/e1000_mac.c
View File

@ -1332,7 +1332,13 @@ s32 igb_id_led_init(struct e1000_hw *hw)
u16 data, i, temp; u16 data, i, temp;
const u16 led_mask = 0x0F; const u16 led_mask = 0x0F;
ret_val = igb_valid_led_default(hw, &data); /* 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) if (ret_val)
goto out; goto out;