e1000e: enable CRC stripping by default
Subsystems (2)
PATCH 1/7 e1000e: enable CRC stripping by default
From: Bruce Allan <[email protected]>
CRC stripping should be enabled by default but was not if it was not specified as a module parameter.
---
drivers/net/e1000e/param.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/e1000e/param.c +2 -0
@@ -427,6 +427,8 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)e1000_validate_option (&crc_stripping, &opt, adapter);if (crc_stripping ==OPTION_ENABLED ) adapter->flags2 |=FLAG2_CRC_STRIPPING ; + }else { + adapter->flags2 |=FLAG2_CRC_STRIPPING ; } } {/* Kumeran Lock Loss Workaround */
PATCH 2/7 e1000e: do not attempt to disable smart powerdown if not supported
From: Bruce Allan <[email protected]>
During reset, the driver was attempting to disable the Smart Powerdown feature even if the part does not support Smart Powerdown. Check for support before attempting to disable the feature.
---
drivers/net/e1000e/netdev.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/e1000e/netdev.c +2 -1
@@ -2799,7 +2799,8 @@ void e1000e_reset(struct e1000_adapter *adapter)e1000e_reset_adaptive (hw);e1000_get_phy_info (hw); -if (!(adapter->flags &FLAG_SMART_POWER_DOWN )) { +if ((adapter->flags &FLAG_HAS_SMART_POWER_DOWN ) && + !(adapter->flags &FLAG_SMART_POWER_DOWN )) {u16 phy_data =0 ;/* * speed up time to link by disabling smart power down, ignore
PATCH 3/7 e1000e: correct flow control thresholds
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
The flow control thresholds, i.e. high and low watermarks of the Rx FIFO for when the hardware should transmit PAUSE frames (XON and XOFF, respectively), need to be tuned for more efficient use of the FIFO. The logic to set the thresholds for parts that support early-receive (ERT) was also wrong in that it should check whether jumbo frames are in use.
---
drivers/net/e1000e/defines.h | 2 ++ drivers/net/e1000e/netdev.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/e1000e/defines.h +2 -0
@@ -469,6 +469,8 @@#define AUTO_READ_DONE_TIMEOUT 10/* Flow Control */ +#define E1000_FCRTH_RTH 0x0000FFF8/* Mask Bits[15:3] for RTH */ +#define E1000_FCRTL_RTL 0x0000FFF8/* Mask Bits[15:3] for RTL */ #define E1000_FCRTL_XONE 0x80000000/* Enable XON frame transmission */ /* Transmit Configuration Word */
drivers/net/e1000e/netdev.c +8 -6
@@ -2751,23 +2751,25 @@ void e1000e_reset(struct e1000_adapter *adapter)/* * flow control settings * -* The high water mark must be low enough to fit one full frame +* The high water mark must be low enough to fit two full frame * (or the size used for early receive) above it in the Rx FIFO. * Set it to the lower of: * - 90% of the Rx FIFO size, and * - the full Rx FIFO size minus the early receive size (for parts * with ERT support assuming ERT set to E1000_ERT_2048), or -* - the full Rx FIFO size minus one full frame +* - the full Rx FIFO size minus two full frames */ -if (adapter->flags &FLAG_HAS_ERT ) +if ((adapter->flags &FLAG_HAS_ERT ) && + (adapter->netdev->mtu >ETH_DATA_LEN )) hwm =min (((pba <<10 ) *9 /10 ), ((pba <<10 ) - (E1000_ERT_2048 <<3 )));else hwm =min (((pba <<10 ) *9 /10 ), - ((pba <<10 ) - adapter->max_frame_size)); + ((pba <<10 ) - (2 * adapter->max_frame_size))); - fc->high_water = hwm &0xFFF8 ;/* 8-byte granularity */ - fc->low_water = fc->high_water -8 ; + fc->high_water = hwm &E1000_FCRTH_RTH ;/* 8-byte granularity */ + fc->low_water = (fc->high_water - (2 * adapter->max_frame_size)); + fc->low_water &=E1000_FCRTL_RTL ;/* 8-byte granularity */ if (adapter->flags &FLAG_DISABLE_FC_PAUSE_TIME ) fc->pause_time =0xFFFF ;
PATCH 4/7 e1000e: specify max supported frame size in adapter struct
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
By putting the maximum frame size supported by the hardware into the adapter structure, the change_mtu entry point function can be cleaned up of checks for all the different max frame sizes supported by
different parts.
---
drivers/net/e1000e/82571.c | 11 +++++++++-- drivers/net/e1000e/e1000.h | 4 ++++ drivers/net/e1000e/es2lan.c | 1 + drivers/net/e1000e/ich8lan.c | 8 ++++++++ drivers/net/e1000e/netdev.c | 27 +++++++++------------------ 5 files changed, 31 insertions(+), 20 deletions(-)
drivers/net/e1000e/82571.c +9 -2
@@ -341,8 +341,10 @@ static s32 e1000_get_variants_82571(struct e1000_adapter *adapter)if (e1000_read_nvm (&adapter->hw,NVM_INIT_3GIO_3 ,1 , &eeprom_data) <0 )break ; -if (eeprom_data &NVM_WORD1A_ASPM_MASK ) - adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES ; +if (!(eeprom_data &NVM_WORD1A_ASPM_MASK )) { + adapter->flags |=FLAG_HAS_JUMBO_FRAMES ; + adapter->max_hw_frame_size =DEFAULT_JUMBO ; + } }break ;default :
@@ -1672,6 +1674,7 @@ struct e1000_info e1000_82571_info = { | FLAG_TARC_SPEED_MODE_BIT /* errata */ | FLAG_APME_CHECK_PORT_B, .pba = 38, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_igp,
@@ -1688,6 +1691,7 @@ struct e1000_info e1000_82572_info = { | FLAG_HAS_CTRLEXT_ON_LOAD | FLAG_TARC_SPEED_MODE_BIT, /* errata */ .pba = 38, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_igp,
@@ -1706,6 +1710,7 @@ struct e1000_info e1000_82573_info = { | FLAG_HAS_ERT | FLAG_HAS_SWSM_ON_LOAD, .pba = 20, + .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_m88,
@@ -1724,6 +1729,7 @@ struct e1000_info e1000_82574_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, + .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm,
@@ -1740,6 +1746,7 @@ struct e1000_info e1000_82583_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm,
drivers/net/e1000e/e1000.h +4 -0
@@ -96,6 +96,8 @@ struct e1000_info;/* Number of packet split data buffers (not including the header buffer) */ #define PS_PAGE_BUFFERS (MAX_PS_BUFFERS - 1) +#define DEFAULT_JUMBO 9234 +enum e1000_boards { board_82571, board_82572,
@@ -293,6 +295,7 @@ struct e1000_adapter {u32 eeprom_wol;u32 wol;u32 pba; +u32 max_hw_frame_size;bool fc_autoneg;
@@ -309,6 +312,7 @@ struct e1000_info {unsigned int flags;unsigned int flags2;u32 pba; +u32 max_hw_frame_size;s32 (*get_variants)(struct e1000_adapter *);struct e1000_mac_operations *mac_ops;struct e1000_phy_operations *phy_ops;
drivers/net/e1000e/es2lan.c +1 -0
@@ -1422,6 +1422,7 @@ struct e1000_info e1000_es2_info = { | FLAG_DISABLE_FC_PAUSE_TIME /* errata */ | FLAG_TIPG_MEDIUM_FOR_80003ESLAN, .pba = 38, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_80003es2lan, .mac_ops = &es2_mac_ops, .phy_ops = &es2_phy_ops,
drivers/net/e1000e/ich8lan.c +8 -0
@@ -382,6 +382,11 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter)if (rc)return rc; +if (adapter->hw.phy.type == e1000_phy_ife) { + adapter->flags &= ~FLAG_HAS_JUMBO_FRAMES ; + adapter->max_hw_frame_size =ETH_FRAME_LEN +ETH_FCS_LEN ; + } +if ((adapter->hw.mac.type == e1000_ich8lan) && (adapter->hw.phy.type == e1000_phy_igp_3)) adapter->flags |=FLAG_LSC_GIG_SPEED_DROP ;
@@ -2595,6 +2600,7 @@ struct e1000_info e1000_ich8_info = { | FLAG_HAS_FLASH | FLAG_APME_IN_WUC, .pba = 8, + .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, .get_variants = e1000_get_variants_ich8lan, .mac_ops = &ich8_mac_ops, .phy_ops = &ich8_phy_ops,
@@ -2613,6 +2619,7 @@ struct e1000_info e1000_ich9_info = { | FLAG_HAS_FLASH | FLAG_APME_IN_WUC, .pba = 10, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_ich8lan, .mac_ops = &ich8_mac_ops, .phy_ops = &ich8_phy_ops,
@@ -2631,6 +2638,7 @@ struct e1000_info e1000_ich10_info = { | FLAG_HAS_FLASH | FLAG_APME_IN_WUC, .pba = 10, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_ich8lan, .mac_ops = &ich8_mac_ops, .phy_ops = &ich8_phy_ops,
drivers/net/e1000e/netdev.c +9 -18
@@ -4212,27 +4212,17 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)struct e1000_adapter *adapter =netdev_priv (netdev);int max_frame = new_mtu +ETH_HLEN +ETH_FCS_LEN ; -if ((new_mtu <ETH_ZLEN +ETH_FCS_LEN +VLAN_HLEN ) || - (max_frame >MAX_JUMBO_FRAME_SIZE )) { -e_err ("Invalid MTU setting\n" ); +/* Jumbo frame support */ +if ((max_frame >ETH_FRAME_LEN +ETH_FCS_LEN ) && + !(adapter->flags &FLAG_HAS_JUMBO_FRAMES )) { +e_err ("Jumbo Frames not supported.\n" );return -EINVAL ; } -/* Jumbo frame size limits */ -if (max_frame >ETH_FRAME_LEN +ETH_FCS_LEN ) { -if (!(adapter->flags &FLAG_HAS_JUMBO_FRAMES )) { -e_err ("Jumbo Frames not supported.\n" ); -return -EINVAL ; - } -if (adapter->hw.phy.type == e1000_phy_ife) { -e_err ("Jumbo Frames not supported.\n" ); -return -EINVAL ; - } - } - -#define MAX_STD_JUMBO_FRAME_SIZE 9234 -if (max_frame >MAX_STD_JUMBO_FRAME_SIZE ) { -e_err ("MTU > 9216 not supported.\n" ); +/* Supported frame sizes */ +if ((new_mtu <ETH_ZLEN +ETH_FCS_LEN +VLAN_HLEN ) || + (max_frame > adapter->max_hw_frame_size)) { +e_err ("Unsupported MTU setting\n" );return -EINVAL ; }
@@ -4848,6 +4838,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, adapter->flags2 = ei->flags2; adapter->hw.adapter = adapter; adapter->hw.mac.type = ei->mac; + adapter->max_hw_frame_size = ei->max_hw_frame_size; adapter->msg_enable = (1 <<NETIF_MSG_DRV |NETIF_MSG_PROBE ) -1 ; mmio_start =pci_resource_start (pdev,0 );
PATCH 5/7 e1000e: add support for 82577/82578 GbE LOM parts
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
This patch provides support for the next generation Intel desktop and mobile gigabit ethernet LOM adapters. These adapters are the follow-on parts to the LOMs tied to the prior ICH chipsets and are comprised of a MAC in the PCH chipset and an external PHY (82577 for mobile and 82578 for desktop versions). New features consist of PHY wakeup to save power by completely turning off the MAC while in Sx state, and 4K jumbo frames.
---
drivers/net/e1000e/82571.c | 2 drivers/net/e1000e/defines.h | 21 + drivers/net/e1000e/e1000.h | 57 +++ drivers/net/e1000e/es2lan.c | 2 drivers/net/e1000e/ethtool.c | 37 +- drivers/net/e1000e/hw.h | 16 + drivers/net/e1000e/ich8lan.c | 431 +++++++++++++++++++++++++- drivers/net/e1000e/lib.c | 38 ++ drivers/net/e1000e/netdev.c | 206 ++++++++++++ drivers/net/e1000e/phy.c | 699 +++++++++++++++++++++++++++++++++++++++++- 10 files changed, 1441 insertions(+), 68 deletions(-)
drivers/net/e1000e/82571.c +2 -0
@@ -1587,6 +1587,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)static struct e1000_mac_operations e82571_mac_ops = {/* .check_mng_mode: mac type dependent */ /* .check_for_link: media type dependent */ + .id_led_init = e1000e_id_led_init, .cleanup_led = e1000e_cleanup_led_generic, .clear_hw_cntrs = e1000_clear_hw_cntrs_82571, .get_bus_info = e1000e_get_bus_info_pcie,
@@ -1598,6 +1599,7 @@ static struct e1000_mac_operations e82571_mac_ops = { .init_hw = e1000_init_hw_82571, .setup_link = e1000_setup_link_82571, /* .setup_physical_interface: media type dependent */ + .setup_led = e1000e_setup_led_generic, };static struct e1000_phy_operations e82_phy_ops_igp = {
drivers/net/e1000e/defines.h +21 -0
@@ -56,6 +56,7 @@/* Wake Up Control */ #define E1000_WUC_APME 0x00000001/* APM Enable */ #define E1000_WUC_PME_EN 0x00000002/* PME Enable */ +#define E1000_WUC_PHY_WAKE 0x00000100/* if PHY supports wakeup */ /* Wake Up Filter Control */ #define E1000_WUFC_LNKC 0x00000001/* Link Status Change Wakeup Enable */
@@ -65,6 +66,13 @@#define E1000_WUFC_BC 0x00000010/* Broadcast Wakeup Enable */ #define E1000_WUFC_ARP 0x00000020/* ARP Request Packet Wakeup Enable */ +/* Wake Up Status */ +#define E1000_WUS_LNKC E1000_WUFC_LNKC +#define E1000_WUS_MAG E1000_WUFC_MAG +#define E1000_WUS_EX E1000_WUFC_EX +#define E1000_WUS_MC E1000_WUFC_MC +#define E1000_WUS_BC E1000_WUFC_BC +/* Extended Device Control */ #define E1000_CTRL_EXT_SDP7_DATA 0x00000080/* Value of SW Definable Pin 7 */ #define E1000_CTRL_EXT_EE_RST 0x00002000/* Reinitialize from EEPROM */
@@ -77,6 +85,7 @@#define E1000_CTRL_EXT_IAME 0x08000000/* Interrupt acknowledge Auto-mask */ #define E1000_CTRL_EXT_INT_TIMER_CLR 0x20000000/* Clear Interrupt timers after IMS clear */ #define E1000_CTRL_EXT_PBA_CLR 0x80000000/* PBA Clear */ +#define E1000_CTRL_EXT_PHYPDEN 0x00100000/* Receive Descriptor bit definitions */ #define E1000_RXD_STAT_DD 0x01/* Descriptor Done */
@@ -140,6 +149,7 @@#define E1000_RCTL_DTYP_PS 0x00000400/* Packet Split descriptor */ #define E1000_RCTL_RDMTS_HALF 0x00000000/* Rx desc min threshold size */ #define E1000_RCTL_MO_SHIFT 12/* multicast offset shift */ +#define E1000_RCTL_MO_3 0x00003000/* multicast offset 15:4 */ #define E1000_RCTL_BAM 0x00008000/* broadcast enable */ /* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */ #define E1000_RCTL_SZ_2048 0x00000000/* Rx buffer size 2048 */
@@ -153,6 +163,7 @@#define E1000_RCTL_VFE 0x00040000/* vlan filter enable */ #define E1000_RCTL_CFIEN 0x00080000/* canonical form enable */ #define E1000_RCTL_CFI 0x00100000/* canonical form indicator */ +#define E1000_RCTL_PMCF 0x00800000/* pass MAC control frames */ #define E1000_RCTL_BSEX 0x02000000/* Buffer size extension */ #define E1000_RCTL_SECRC 0x04000000/* Strip Ethernet CRC */
@@ -255,11 +266,16 @@#define AUTONEG_ADVERTISE_SPEED_DEFAULT E1000_ALL_SPEED_DUPLEX/* LED Control */ +#define E1000_PHY_LED0_MODE_MASK 0x00000007 +#define E1000_PHY_LED0_IVRT 0x00000008 +#define E1000_PHY_LED0_MASK 0x0000001F +#define E1000_LEDCTL_LED0_MODE_MASK 0x0000000F#define E1000_LEDCTL_LED0_MODE_SHIFT 0#define E1000_LEDCTL_LED0_IVRT 0x00000040#define E1000_LEDCTL_LED0_BLINK 0x00000080 +#define E1000_LEDCTL_MODE_LINK_UP 0x2#define E1000_LEDCTL_MODE_LED_ON 0xE#define E1000_LEDCTL_MODE_LED_OFF 0xF
@@ -676,6 +692,8 @@#define IFE_C_E_PHY_ID 0x02A80310#define BME1000_E_PHY_ID 0x01410CB0#define BME1000_E_PHY_ID_R2 0x01410CB1 +#define I82577_E_PHY_ID 0x01540050 +#define I82578_E_PHY_ID 0x004DD040/* M88E1000 Specific Registers */ #define M88E1000_PHY_SPEC_CTRL 0x10/* PHY Specific Control Register */
@@ -729,6 +747,9 @@#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK 0x0E00#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X 0x0800 +#define I82578_EPSCR_DOWNSHIFT_ENABLE 0x0020 +#define I82578_EPSCR_DOWNSHIFT_COUNTER_MASK 0x001C +/* BME1000 PHY Specific Control Register */ #define BME1000_PSCR_ENABLE_DOWNSHIFT 0x0800/* 1 = enable downshift */
drivers/net/e1000e/e1000.h +57 -0
99 lines not on this page · raw message
drivers/net/e1000e/es2lan.c +2 -0
@@ -1366,6 +1366,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) }static struct e1000_mac_operations es2_mac_ops = { + .id_led_init = e1000e_id_led_init, .check_mng_mode = e1000e_check_mng_mode_generic,/* check_for_link dependent on media type */ .cleanup_led = e1000e_cleanup_led_generic,
@@ -1379,6 +1380,7 @@ static struct e1000_mac_operations es2_mac_ops = { .init_hw = e1000_init_hw_80003es2lan, .setup_link = e1000e_setup_link, /* setup_physical_interface dependent on media type */ + .setup_led = e1000e_setup_led_generic, };static struct e1000_phy_operations es2_phy_ops = {
drivers/net/e1000e/ethtool.c +23 -14
@@ -776,6 +776,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)u32 after;u32 i;u32 toggle; +u32 mask;/* * The status register is Read Only, so a write should fail.
@@ -788,17 +789,9 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)case e1000_80003es2lan: toggle =0x7FFFF3FF ;break ; -case e1000_82573: -case e1000_82574: -case e1000_82583: -case e1000_ich8lan: -case e1000_ich9lan: -case e1000_ich10lan: +default : toggle =0x7FFFF033 ;break ; -default : - toggle =0xFFFFF833 ; -break ; } before =er32 (STATUS );
@@ -844,11 +837,18 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)REG_PATTERN_TEST (E1000_TXCW ,0xC000FFFF ,0x0000FFFF );REG_PATTERN_TEST (E1000_TDBAL ,0xFFFFFFF0 ,0xFFFFFFFF );REG_PATTERN_TEST (E1000_TIDV ,0x0000FFFF ,0x0000FFFF ); + mask =0x8003FFFF ; +switch (mac->type) { +case e1000_ich10lan: +case e1000_pchlan: + mask |= (1 <<18 ); +break ; +default : +break ; + }for (i =0 ; i < mac->rar_entry_count; i++)REG_PATTERN_TEST_ARRAY (E1000_RA , ((i <<1 ) +1 ), - ((mac->type == e1000_ich10lan) ? -0x8007FFFF :0x8003FFFF ), -0xFFFFFFFF ); + mask,0xFFFFFFFF );for (i =0 ; i < mac->mta_reg_count; i++)REG_PATTERN_TEST_ARRAY (E1000_MTA , i,0xFFFFFFFF ,0xFFFFFFFF );
@@ -1786,15 +1786,22 @@ static int e1000_set_wol(struct net_device *netdev,/* bit defines for adapter->led_status */ #define E1000_LED_ON 0 -static void e1000_led_blink_callback (unsigned long data) +static void e1000e_led_blink_task (struct work_struct *work) { -struct e1000_adapter *adapter = (struct e1000_adapter *) data; +struct e1000_adapter *adapter =container_of (work, + struct e1000_adapter, led_blink_task);if (test_and_change_bit (E1000_LED_ON , &adapter->led_status)) adapter->hw.mac.ops.led_off (&adapter->hw);else adapter->hw.mac.ops.led_on (&adapter->hw); +} + +static void e1000_led_blink_callback (unsigned long data) +{ +struct e1000_adapter *adapter = (struct e1000_adapter *) data; +schedule_work (&adapter->led_blink_task);mod_timer (&adapter->blink_timer, jiffies +E1000_ID_INTERVAL ); }
@@ -1807,7 +1814,9 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) data =INT_MAX ;if ((hw->phy.type == e1000_phy_ife) || + (hw->mac.type == e1000_pchlan) || (hw->mac.type == e1000_82574)) { +INIT_WORK (&adapter->led_blink_task, e1000e_led_blink_task);if (!adapter->blink_timer.function) {init_timer (&adapter->blink_timer); adapter->blink_timer.function =
drivers/net/e1000e/hw.h +15 -1
@@ -193,7 +193,11 @@ enum e1e_registers {E1000_RXCSUM =0x05000 ,/* Rx Checksum Control - RW */ E1000_RFCTL =0x05008 ,/* Receive Filter Control */ E1000_MTA =0x05200 ,/* Multicast Table Array - RW Array */ -E1000_RA =0x05400 ,/* Receive Address - RW Array */ +E1000_RAL_BASE =0x05400 ,/* Receive Address Low - RW */ +#define E1000_RAL(_n) (E1000_RAL_BASE + ((_n) * 8)) +#define E1000_RA (E1000_RAL(0)) + E1000_RAH_BASE = 0x05404, /* Receive Address High - RW */ +#define E1000_RAH (_n) (E1000_RAH_BASE + ((_n) * 8))E1000_VFTA =0x05600 ,/* VLAN Filter Table Array - RW Array */ E1000_WUC =0x05800 ,/* Wakeup Control - RW */ E1000_WUFC = 0x05808, /* Wakeup Filter Control - RW */
@@ -368,6 +372,10 @@ enum e1e_registers {#define E1000_DEV_ID_ICH10_R_BM_V 0x10CE#define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE#define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF +#define E1000_DEV_ID_PCH_M_HV_LM 0x10EA +#define E1000_DEV_ID_PCH_M_HV_LC 0x10EB +#define E1000_DEV_ID_PCH_D_HV_DM 0x10EF +#define E1000_DEV_ID_PCH_D_HV_DC 0x10F0#define E1000_REVISION_4 4
@@ -383,6 +391,7 @@ enum e1000_mac_type { e1000_ich8lan, e1000_ich9lan, e1000_ich10lan, + e1000_pchlan, }; enum e1000_media_type {
@@ -417,6 +426,8 @@ enum e1000_phy_type { e1000_phy_igp_3, e1000_phy_ife, e1000_phy_bm, + e1000_phy_82578, + e1000_phy_82577, }; enum e1000_bus_width {
@@ -720,6 +731,7 @@ struct e1000_host_mng_command_info {/* Function pointers and static data for the MAC. */ struct e1000_mac_operations { +s32 (*id_led_init)(struct e1000_hw *);bool (*check_mng_mode)(struct e1000_hw *);s32 (*check_for_link)(struct e1000_hw *);s32 (*cleanup_led)(struct e1000_hw *);
@@ -733,11 +745,13 @@ struct e1000_mac_operations {s32 (*init_hw)(struct e1000_hw *);s32 (*setup_link)(struct e1000_hw *);s32 (*setup_physical_interface)(struct e1000_hw *); +s32 (*setup_led)(struct e1000_hw *); };/* Function pointers for the PHY. */ struct e1000_phy_operations {s32 (*acquire_phy)(struct e1000_hw *); +s32 (*check_polarity)(struct e1000_hw *);s32 (*check_reset_block)(struct e1000_hw *);s32 (*commit_phy)(struct e1000_hw *);s32 (*force_speed_duplex)(struct e1000_hw *);
drivers/net/e1000e/ich8lan.c +408 -23
621 lines not on this page · raw message
drivers/net/e1000e/lib.c +38 -0
@@ -378,6 +378,12 @@ s32 e1000e_check_for_copper_link(struct e1000_hw *hw) mac->get_link_status =0 ; +if (hw->phy.type == e1000_phy_82578) { + ret_val =e1000_link_stall_workaround_hv (hw); +if (ret_val) +return ret_val; + } +/* * Check if there was DownShift, must be checked * immediately after link-up
@@ -1406,6 +1412,38 @@ s32 e1000e_id_led_init(struct e1000_hw *hw) }/** +* e1000e_setup_led_generic - Configures SW controllable LED +* @hw: pointer to the HW structure +* +* This prepares the SW controllable LED for use and saves the current state +* of the LED so it can be later restored. +**/ +s32 e1000e_setup_led_generic (struct e1000_hw *hw) +{ +u32 ledctl; + +if (hw->mac.ops.setup_led != e1000e_setup_led_generic) { +return -E1000_ERR_CONFIG ; + } + +if (hw->phy.media_type == e1000_media_type_fiber) { + ledctl =er32 (LEDCTL ); + hw->mac.ledctl_default = ledctl; +/* Turn off LED0 */ + ledctl &= ~(E1000_LEDCTL_LED0_IVRT | +E1000_LEDCTL_LED0_BLINK | +E1000_LEDCTL_LED0_MODE_MASK ); + ledctl |= (E1000_LEDCTL_MODE_LED_OFF << +E1000_LEDCTL_LED0_MODE_SHIFT ); +ew32 (LEDCTL , ledctl); + }else if (hw->phy.media_type == e1000_media_type_copper) { +ew32 (LEDCTL , hw->mac.ledctl_mode1); + } + +return 0 ; +} + +/** * e1000e_cleanup_led_generic - Set LED config to default operation * @hw: pointer to the HW structure *
drivers/net/e1000e/netdev.c +193 -13
283 lines not on this page · raw message
drivers/net/e1000e/phy.c +682 -17
767 lines not on this page · raw message
PATCH 6/7 e1000e: workaround a Tx hang on 82577/82578
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
With bi-directional stress traffic, the receiver could hang causing the hardware to stop and a "Detected Tx Unit Hang" message dumped to the system logfile. Temporarily workaround this issue by disabling Tx flow control by default. The issue is currently being investigated and a follow-on patch will be provided to revert this when it is resolved.
---
drivers/net/e1000e/ich8lan.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/e1000e/ich8lan.c +7 -2
@@ -2348,8 +2348,13 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)* the default flow control setting, so we explicitly * set it to full. */ -if (hw->fc.requested_mode == e1000_fc_default) - hw->fc.requested_mode = e1000_fc_full; +if (hw->fc.requested_mode == e1000_fc_default) { +/* Workaround h/w hang when Tx flow control enabled */ +if (hw->mac.type == e1000_pchlan) + hw->fc.requested_mode = e1000_fc_rx_pause; +else + hw->fc.requested_mode = e1000_fc_full; + }/* * Save off the requested flow control mode for use later. Depending
PATCH 7/7 e1000e: bump the version number
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
---
drivers/net/e1000e/netdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/e1000e/netdev.c +1 -1
@@ -48,7 +48,7 @@#include "e1000.h" -#define DRV_VERSION "0.3.3.4-k4" +#define DRV_VERSION "1.0.2-k2"char e1000e_driver_name[] ="e1000e" ;const char e1000e_driver_version[] =DRV_VERSION ;
David Miller
maintainerAll 7 patches applied to net-next-2.6, thanks.