diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2005-12-13 00:06:22 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:06:22 -0500 |
commit | fd803241744ad6e4262b6588c6af89e8fb794098 (patch) | |
tree | d8c4261a4799a2c9ee980cdd6a0c3c5ac61cafed /drivers/net/e1000/e1000_hw.h | |
parent | ff7eba15ae65e4299fd9e0fbf067477ce6b43d91 (diff) |
e1000: Fixes for 8357x
- TSO workaround
- Fixes eeprom version reporting
- Fix loopback test
- Fix for WOL
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_hw.h')
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 76ce12809a11..7caa35748cea 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -123,6 +123,7 @@ typedef enum { | |||
123 | e1000_bus_width_32, | 123 | e1000_bus_width_32, |
124 | e1000_bus_width_64, | 124 | e1000_bus_width_64, |
125 | e1000_bus_width_pciex_1, | 125 | e1000_bus_width_pciex_1, |
126 | e1000_bus_width_pciex_2, | ||
126 | e1000_bus_width_pciex_4, | 127 | e1000_bus_width_pciex_4, |
127 | e1000_bus_width_reserved | 128 | e1000_bus_width_reserved |
128 | } e1000_bus_width; | 129 | } e1000_bus_width; |
@@ -149,6 +150,7 @@ typedef enum { | |||
149 | e1000_igp_cable_length_90 = 90, | 150 | e1000_igp_cable_length_90 = 90, |
150 | e1000_igp_cable_length_100 = 100, | 151 | e1000_igp_cable_length_100 = 100, |
151 | e1000_igp_cable_length_110 = 110, | 152 | e1000_igp_cable_length_110 = 110, |
153 | e1000_igp_cable_length_115 = 115, | ||
152 | e1000_igp_cable_length_120 = 120, | 154 | e1000_igp_cable_length_120 = 120, |
153 | e1000_igp_cable_length_130 = 130, | 155 | e1000_igp_cable_length_130 = 130, |
154 | e1000_igp_cable_length_140 = 140, | 156 | e1000_igp_cable_length_140 = 140, |
@@ -1457,6 +1459,7 @@ struct e1000_hw { | |||
1457 | #define E1000_EECD_AUPDEN 0x00100000 /* Enable Autonomous FLASH update */ | 1459 | #define E1000_EECD_AUPDEN 0x00100000 /* Enable Autonomous FLASH update */ |
1458 | #define E1000_EECD_SHADV 0x00200000 /* Shadow RAM Data Valid */ | 1460 | #define E1000_EECD_SHADV 0x00200000 /* Shadow RAM Data Valid */ |
1459 | #define E1000_EECD_SEC1VAL 0x00400000 /* Sector One Valid */ | 1461 | #define E1000_EECD_SEC1VAL 0x00400000 /* Sector One Valid */ |
1462 | #define E1000_EECD_SECVAL_SHIFT 22 | ||
1460 | #define E1000_STM_OPCODE 0xDB00 | 1463 | #define E1000_STM_OPCODE 0xDB00 |
1461 | #define E1000_HICR_FW_RESET 0xC0 | 1464 | #define E1000_HICR_FW_RESET 0xC0 |
1462 | 1465 | ||
@@ -1951,7 +1954,6 @@ struct e1000_host_command_info { | |||
1951 | 1954 | ||
1952 | #define E1000_MDALIGN 4096 | 1955 | #define E1000_MDALIGN 4096 |
1953 | 1956 | ||
1954 | #define E1000_GCR_BEM32 0x00400000 | ||
1955 | #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000 | 1957 | #define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000 |
1956 | /* Function Active and Power State to MNG */ | 1958 | /* Function Active and Power State to MNG */ |
1957 | #define E1000_FACTPS_FUNC0_POWER_STATE_MASK 0x00000003 | 1959 | #define E1000_FACTPS_FUNC0_POWER_STATE_MASK 0x00000003 |