diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-11-19 07:42:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-20 13:00:11 -0500 |
commit | bb2ac47bcfd47ed9431ff1676ec8d79250c941c9 (patch) | |
tree | 2c717135feb469a84382f9532ed6dd70b1ef024c /drivers/net/igb/e1000_hw.h | |
parent | 2909c3f79d933b55bf2485addb1dca762210b6af (diff) |
igb: add support for 82580 MAC
This patch adds support for the 82580 MAC.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
-rw-r--r-- | drivers/net/igb/e1000_hw.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index 5deda3e78422..dbaeb5f5e0c7 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h | |||
@@ -47,19 +47,30 @@ struct e1000_hw; | |||
47 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 | 47 | #define E1000_DEV_ID_82575EB_COPPER 0x10A7 |
48 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 | 48 | #define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9 |
49 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 | 49 | #define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6 |
50 | #define E1000_DEV_ID_82580_COPPER 0x150E | ||
51 | #define E1000_DEV_ID_82580_FIBER 0x150F | ||
52 | #define E1000_DEV_ID_82580_SERDES 0x1510 | ||
53 | #define E1000_DEV_ID_82580_SGMII 0x1511 | ||
54 | #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 | ||
50 | 55 | ||
51 | #define E1000_REVISION_2 2 | 56 | #define E1000_REVISION_2 2 |
52 | #define E1000_REVISION_4 4 | 57 | #define E1000_REVISION_4 4 |
53 | 58 | ||
54 | #define E1000_FUNC_0 0 | 59 | #define E1000_FUNC_0 0 |
55 | #define E1000_FUNC_1 1 | 60 | #define E1000_FUNC_1 1 |
61 | #define E1000_FUNC_2 2 | ||
62 | #define E1000_FUNC_3 3 | ||
56 | 63 | ||
64 | #define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0 0 | ||
57 | #define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1 3 | 65 | #define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1 3 |
66 | #define E1000_ALT_MAC_ADDRESS_OFFSET_LAN2 6 | ||
67 | #define E1000_ALT_MAC_ADDRESS_OFFSET_LAN3 9 | ||
58 | 68 | ||
59 | enum e1000_mac_type { | 69 | enum e1000_mac_type { |
60 | e1000_undefined = 0, | 70 | e1000_undefined = 0, |
61 | e1000_82575, | 71 | e1000_82575, |
62 | e1000_82576, | 72 | e1000_82576, |
73 | e1000_82580, | ||
63 | e1000_num_macs /* List is 1-based, so subtract 1 for true count. */ | 74 | e1000_num_macs /* List is 1-based, so subtract 1 for true count. */ |
64 | }; | 75 | }; |
65 | 76 | ||
@@ -290,6 +301,7 @@ struct e1000_mac_operations { | |||
290 | 301 | ||
291 | struct e1000_phy_operations { | 302 | struct e1000_phy_operations { |
292 | s32 (*acquire)(struct e1000_hw *); | 303 | s32 (*acquire)(struct e1000_hw *); |
304 | s32 (*check_polarity)(struct e1000_hw *); | ||
293 | s32 (*check_reset_block)(struct e1000_hw *); | 305 | s32 (*check_reset_block)(struct e1000_hw *); |
294 | s32 (*force_speed_duplex)(struct e1000_hw *); | 306 | s32 (*force_speed_duplex)(struct e1000_hw *); |
295 | s32 (*get_cfg_done)(struct e1000_hw *hw); | 307 | s32 (*get_cfg_done)(struct e1000_hw *hw); |
@@ -466,6 +478,7 @@ struct e1000_mbx_info { | |||
466 | 478 | ||
467 | struct e1000_dev_spec_82575 { | 479 | struct e1000_dev_spec_82575 { |
468 | bool sgmii_active; | 480 | bool sgmii_active; |
481 | bool global_device_reset; | ||
469 | }; | 482 | }; |
470 | 483 | ||
471 | struct e1000_hw { | 484 | struct e1000_hw { |