diff options
Diffstat (limited to 'drivers/net/e1000e/hw.h')
-rw-r--r-- | drivers/net/e1000e/hw.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 74f263acb172..f66ed37a7f76 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
@@ -65,7 +65,11 @@ enum e1e_registers { | |||
65 | E1000_ICS = 0x000C8, /* Interrupt Cause Set - WO */ | 65 | E1000_ICS = 0x000C8, /* Interrupt Cause Set - WO */ |
66 | E1000_IMS = 0x000D0, /* Interrupt Mask Set - RW */ | 66 | E1000_IMS = 0x000D0, /* Interrupt Mask Set - RW */ |
67 | E1000_IMC = 0x000D8, /* Interrupt Mask Clear - WO */ | 67 | E1000_IMC = 0x000D8, /* Interrupt Mask Clear - WO */ |
68 | E1000_EIAC_82574 = 0x000DC, /* Ext. Interrupt Auto Clear - RW */ | ||
68 | E1000_IAM = 0x000E0, /* Interrupt Acknowledge Auto Mask */ | 69 | E1000_IAM = 0x000E0, /* Interrupt Acknowledge Auto Mask */ |
70 | E1000_IVAR = 0x000E4, /* Interrupt Vector Allocation - RW */ | ||
71 | E1000_EITR_82574_BASE = 0x000E8, /* Interrupt Throttling - RW */ | ||
72 | #define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n << 2)) | ||
69 | E1000_RCTL = 0x00100, /* Rx Control - RW */ | 73 | E1000_RCTL = 0x00100, /* Rx Control - RW */ |
70 | E1000_FCTTV = 0x00170, /* Flow Control Transmit Timer Value - RW */ | 74 | E1000_FCTTV = 0x00170, /* Flow Control Transmit Timer Value - RW */ |
71 | E1000_TXCW = 0x00178, /* Tx Configuration Word - RW */ | 75 | E1000_TXCW = 0x00178, /* Tx Configuration Word - RW */ |
@@ -332,6 +336,7 @@ enum e1e_registers { | |||
332 | #define E1000_DEV_ID_82573E 0x108B | 336 | #define E1000_DEV_ID_82573E 0x108B |
333 | #define E1000_DEV_ID_82573E_IAMT 0x108C | 337 | #define E1000_DEV_ID_82573E_IAMT 0x108C |
334 | #define E1000_DEV_ID_82573L 0x109A | 338 | #define E1000_DEV_ID_82573L 0x109A |
339 | #define E1000_DEV_ID_82574L 0x10D3 | ||
335 | 340 | ||
336 | #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT 0x1096 | 341 | #define E1000_DEV_ID_80003ES2LAN_COPPER_DPT 0x1096 |
337 | #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT 0x1098 | 342 | #define E1000_DEV_ID_80003ES2LAN_SERDES_DPT 0x1098 |
@@ -346,6 +351,7 @@ enum e1e_registers { | |||
346 | #define E1000_DEV_ID_ICH8_IFE_G 0x10C5 | 351 | #define E1000_DEV_ID_ICH8_IFE_G 0x10C5 |
347 | #define E1000_DEV_ID_ICH8_IGP_M 0x104D | 352 | #define E1000_DEV_ID_ICH8_IGP_M 0x104D |
348 | #define E1000_DEV_ID_ICH9_IGP_AMT 0x10BD | 353 | #define E1000_DEV_ID_ICH9_IGP_AMT 0x10BD |
354 | #define E1000_DEV_ID_ICH9_BM 0x10E5 | ||
349 | #define E1000_DEV_ID_ICH9_IGP_M_AMT 0x10F5 | 355 | #define E1000_DEV_ID_ICH9_IGP_M_AMT 0x10F5 |
350 | #define E1000_DEV_ID_ICH9_IGP_M 0x10BF | 356 | #define E1000_DEV_ID_ICH9_IGP_M 0x10BF |
351 | #define E1000_DEV_ID_ICH9_IGP_M_V 0x10CB | 357 | #define E1000_DEV_ID_ICH9_IGP_M_V 0x10CB |
@@ -356,6 +362,10 @@ enum e1e_registers { | |||
356 | #define E1000_DEV_ID_ICH10_R_BM_LM 0x10CC | 362 | #define E1000_DEV_ID_ICH10_R_BM_LM 0x10CC |
357 | #define E1000_DEV_ID_ICH10_R_BM_LF 0x10CD | 363 | #define E1000_DEV_ID_ICH10_R_BM_LF 0x10CD |
358 | #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE | 364 | #define E1000_DEV_ID_ICH10_R_BM_V 0x10CE |
365 | #define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE | ||
366 | #define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF | ||
367 | |||
368 | #define E1000_REVISION_4 4 | ||
359 | 369 | ||
360 | #define E1000_FUNC_1 1 | 370 | #define E1000_FUNC_1 1 |
361 | 371 | ||
@@ -363,9 +373,11 @@ enum e1000_mac_type { | |||
363 | e1000_82571, | 373 | e1000_82571, |
364 | e1000_82572, | 374 | e1000_82572, |
365 | e1000_82573, | 375 | e1000_82573, |
376 | e1000_82574, | ||
366 | e1000_80003es2lan, | 377 | e1000_80003es2lan, |
367 | e1000_ich8lan, | 378 | e1000_ich8lan, |
368 | e1000_ich9lan, | 379 | e1000_ich9lan, |
380 | e1000_ich10lan, | ||
369 | }; | 381 | }; |
370 | 382 | ||
371 | enum e1000_media_type { | 383 | enum e1000_media_type { |
@@ -696,8 +708,7 @@ struct e1000_host_mng_command_info { | |||
696 | 708 | ||
697 | /* Function pointers and static data for the MAC. */ | 709 | /* Function pointers and static data for the MAC. */ |
698 | struct e1000_mac_operations { | 710 | struct e1000_mac_operations { |
699 | u32 mng_mode_enab; | 711 | bool (*check_mng_mode)(struct e1000_hw *); |
700 | |||
701 | s32 (*check_for_link)(struct e1000_hw *); | 712 | s32 (*check_for_link)(struct e1000_hw *); |
702 | s32 (*cleanup_led)(struct e1000_hw *); | 713 | s32 (*cleanup_led)(struct e1000_hw *); |
703 | void (*clear_hw_cntrs)(struct e1000_hw *); | 714 | void (*clear_hw_cntrs)(struct e1000_hw *); |