e1000e: use static params to save stack space (part 2)
Subsystems (2)
PATCH 1/12 e1000e: use static params to save stack space (part 2)
From: Bruce Allan <[email protected]>
A couple stack cleanups missed in an earlier patch from Jesse.
---
drivers/net/e1000e/param.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000e/param.c +2 -2
@@ -286,7 +286,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) } } {/* Receive Interrupt Delay */ -struct e1000_option opt = { +static struct e1000_option opt = { .type = range_option, .name ="Receive Interrupt Delay" , .err ="using default of "
@@ -386,7 +386,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) } } {/* Interrupt Mode */ -struct e1000_option opt = { +static struct e1000_option opt = { .type = range_option, .name ="Interrupt Mode" , .err ="defaulting to 2 (MSI-X)" ,
PATCH 2/12 e1000e: bad state after running ethtool diagnostics with AMT enabled
From: Bruce Allan <[email protected]>
When running ethtool online diagnostics with no open interface, there is a short period of time where the driver relinquishes control of the adapter during which time AMT (manageability firmware) can put the adapter into an unknown state resulting in such things as link test failure, hardware hang, reporting an incorrect link speed, etc. Resetting the adapter during an open() resolves this by putting the adapter into a quiescent state.
---
drivers/net/e1000e/ethtool.c | 9 +++++++++ drivers/net/e1000e/netdev.c | 16 +++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-)
drivers/net/e1000e/ethtool.c +9 -0
@@ -1737,6 +1737,12 @@ static void e1000_diag_test(struct net_device *netdev,if (if_running)dev_open (netdev); }else { +if (!if_running && (adapter->flags &FLAG_HAS_AMT )) { +clear_bit (__E1000_TESTING, &adapter->state); +dev_open (netdev); +set_bit (__E1000_TESTING, &adapter->state); + } +e_info ("online testing starting\n" );/* Online tests */ if (e1000_link_test (adapter, &data[4 ]))
@@ -1748,6 +1754,9 @@ static void e1000_diag_test(struct net_device *netdev, data[2 ] =0 ; data[3 ] =0 ; +if (!if_running && (adapter->flags &FLAG_HAS_AMT )) +dev_close (netdev); +clear_bit (__E1000_TESTING, &adapter->state); }msleep_interruptible (4 *1000 );
drivers/net/e1000e/netdev.c +9 -7
@@ -3444,6 +3444,15 @@ static int e1000_open(struct net_device *netdev)if (err) goto err_setup_rx; +/* +* If AMT is enabled, let the firmware know that the network +* interface is now open and reset the part to a known state. +*/ +if (adapter->flags &FLAG_HAS_AMT ) { +e1000_get_hw_control (adapter); +e1000e_reset (adapter); + } +e1000e_power_up_phy (adapter); adapter->mng_vlan_id =E1000_MNG_VLAN_NONE ;
@@ -3452,13 +3461,6 @@ static int e1000_open(struct net_device *netdev)e1000_update_mng_vlan (adapter);/* -* If AMT is enabled, let the firmware know that the network -* interface is now open -*/ -if (adapter->flags &FLAG_HAS_AMT ) -e1000_get_hw_control (adapter); - -/* * before we allocate an interrupt, we must be ready to handle it. * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt * as soon as we call pci_request_irq, so we have to setup our
Re: [net-next-2.6 PATCH 02/12] e1000e: bad state after running ethtool diagnostics with AMT enabled
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 17:59:31 -0700
Quoted 11 lines
From: Bruce Allan <[email protected]>
When running ethtool online diagnostics with no open interface, there is a short period of time where the driver relinquishes control of the adapter during which time AMT (manageability firmware) can put the adapter into an unknown state resulting in such things as link test failure, hardware hang, reporting an incorrect link speed, etc. Resetting the adapter during an
open()resolves this by putting the adapter into a quiescent state.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/12 e1000e: initialize manageability (IPMI) pass-through in 82574/82583
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
82574/82583 uses different registers/bits to setup manageability filters than all other parts supported by e1000e; set them accordingly for IPMI pass-through. Rename the function to better reflect what it does.
---
drivers/net/e1000e/defines.h | 5 ++++ drivers/net/e1000e/hw.h | 2 + drivers/net/e1000e/netdev.c | 57 +++++++++++++++++++++++++++++++++++------- 3 files changed, 55 insertions(+), 9 deletions(-)
drivers/net/e1000e/defines.h +5 -0
@@ -138,6 +138,11 @@/* Enable MNG packets to host memory */ #define E1000_MANC_EN_MNG2HOST 0x00200000 +#define E1000_MANC2H_PORT_623 0x00000020/* Port 0x26f */ +#define E1000_MANC2H_PORT_664 0x00000040/* Port 0x298 */ +#define E1000_MDEF_PORT_623 0x00000800/* Port 0x26f */ +#define E1000_MDEF_PORT_664 0x00000400/* Port 0x298 */ +/* Receive Control */ #define E1000_RCTL_EN 0x00000002/* enable */ #define E1000_RCTL_SBP 0x00000004/* store bad packet */
drivers/net/e1000e/hw.h +2 -0
@@ -208,6 +208,8 @@ enum e1e_registers {E1000_KMRNCTRLSTA =0x00034 ,/* MAC-PHY interface - RW */ E1000_MANC2H =0x05860 ,/* Management Control To Host - RW */ +E1000_MDEF_BASE =0x05890 ,/* Management Decision Filters */ +#define E1000_MDEF(_n) (E1000_MDEF_BASE + ((_n) * 4))E1000_SW_FW_SYNC =0x05B5C ,/* Software-Firmware Synchronization - RW */ E1000_GCR =0x05B00 ,/* PCI-Ex Control */ E1000_GCR2 = 0x05B64, /* PCI-Ex Control #2 */
drivers/net/e1000e/netdev.c +48 -9
89 lines not on this page · raw message
Re: [net-next-2.6 PATCH 03/12] e1000e: initialize manageability (IPMI) pass-through in 82574/82583
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 17:59:51 -0700
Quoted 8 lines
From: Bruce Allan <[email protected]>
82574/82583 uses different registers/bits to setup manageability filters than all other parts supported by e1000e; set them accordingly for IPMI pass-through. Rename the function to better reflect what it does.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 4/12 e1000e: s/w initiated LSC MSI-X interrupts not generated; no transmit
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
In MSI-X mode when an IMPI SoL session was active (i.e. the PHY reset was blocked), the LSC interrupt generated by s/w to start the watchdog which started the transmitter was not getting fired by the hardware because bit 24 (the 'other' cause bit) also needed to be set. Without an active SoL session, the PHY was reset which caused the h/w to fire the LSC interrupt.
---
drivers/net/e1000e/netdev.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/e1000e/netdev.c +9 -2
@@ -3220,7 +3220,11 @@ int e1000e_up(struct e1000_adapter *adapter)netif_wake_queue (adapter->netdev);/* fire a link change interrupt to start the watchdog */ -ew32 (ICS ,E1000_ICS_LSC ); +if (adapter->msix_entries) +ew32 (ICS ,E1000_ICS_LSC |E1000_ICR_OTHER ); +else +ew32 (ICS ,E1000_ICS_LSC ); +return 0 ; }
@@ -3537,7 +3541,10 @@ static int e1000_open(struct net_device *netdev)pm_runtime_put (&pdev->dev);/* fire a link status change interrupt to start the watchdog */ -ew32 (ICS ,E1000_ICS_LSC ); +if (adapter->msix_entries) +ew32 (ICS ,E1000_ICS_LSC |E1000_ICR_OTHER ); +else +ew32 (ICS ,E1000_ICS_LSC );return 0 ;
Re: [net-next-2.6 PATCH 04/12] e1000e: s/w initiated LSC MSI-X interrupts not generated; no transmit
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:00:10 -0700
Quoted 10 lines
From: Bruce Allan <[email protected]>
In MSI-X mode when an IMPI SoL session was active (i.e. the PHY reset was blocked), the LSC interrupt generated by s/w to start the watchdog which started the transmitter was not getting fired by the hardware because bit 24 (the 'other' cause bit) also needed to be set. Without an active SoL session, the PHY was reset which caused the h/w to fire the LSC interrupt.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 5/12 e1000e: cleanup multiple common exit points
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
...in e1000_update_nvm_checksum_ich8lan().
---
drivers/net/e1000e/ich8lan.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-)
drivers/net/e1000e/ich8lan.c +17 -24
@@ -1938,18 +1938,14 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw) new_bank_offset = nvm->flash_bank_size; old_bank_offset =0 ; ret_val =e1000_erase_flash_bank_ich8lan (hw,1 ); -if (ret_val) { - nvm->ops.release (hw); - goto out; - } +if (ret_val) + goto release; }else { old_bank_offset = nvm->flash_bank_size; new_bank_offset =0 ; ret_val =e1000_erase_flash_bank_ich8lan (hw,0 ); -if (ret_val) { - nvm->ops.release (hw); - goto out; - } +if (ret_val) + goto release; }for (i =0 ; i <E1000_ICH8_SHADOW_RAM_WORDS ; i++) {
@@ -2005,8 +2001,7 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)if (ret_val) {/* Possibly read-only, see e1000e_write_protect_nvm_ich8lan() */ e_dbg ("Flash commit failed.\n" ); - nvm->ops.release (hw); - goto out; + goto release; }/*
@@ -2017,18 +2012,15 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)*/ act_offset = new_bank_offset +E1000_ICH_NVM_SIG_WORD ; ret_val =e1000_read_flash_word_ich8lan (hw, act_offset, &data); -if (ret_val) { - nvm->ops.release (hw); - goto out; - } +if (ret_val) + goto release; + data &=0xBFFF ; ret_val =e1000_retry_write_flash_byte_ich8lan (hw, act_offset *2 +1 , (u8)(data >>8 )); -if (ret_val) { - nvm->ops.release (hw); - goto out; - } +if (ret_val) + goto release;/* * And invalidate the previously valid segment by setting
@@ -2038,10 +2030,8 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw)*/ act_offset = (old_bank_offset +E1000_ICH_NVM_SIG_WORD ) *2 +1 ; ret_val =e1000_retry_write_flash_byte_ich8lan (hw, act_offset,0 ); -if (ret_val) { - nvm->ops.release (hw); - goto out; - } +if (ret_val) + goto release;/* Great! Everything worked, we can now clear the cached entries. */ for (i =0 ; i <E1000_ICH8_SHADOW_RAM_WORDS ; i++) {
@@ -2049,14 +2039,17 @@ static s32 e1000_update_nvm_checksum_ich8lan(struct e1000_hw *hw) dev_spec->shadow_ram[i].value =0xFFFF ; } +release: nvm->ops.release (hw);/* * Reload the EEPROM, or else modifications will not appear * until after the next adapter reset. */ -e1000e_reload_nvm (hw); -msleep (10 ); +if (!ret_val) { +e1000e_reload_nvm (hw); +msleep (10 ); + } out:if (ret_val)
Re: [net-next-2.6 PATCH 05/12] e1000e: cleanup multiple common exit points
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:00:31 -0700
Quoted 6 lines
From: Bruce Allan <[email protected]>
...in
e1000_update_nvm_checksum_ich8lan().Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 6/12 e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
Patch addresses issues when manageability passthrough is enabled, but the MAC_ADDR_FILTER bit is not set in the MANC register.
---
drivers/net/e1000e/lib.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/e1000e/lib.c +4 -4
@@ -2515,10 +2515,11 @@ s32 e1000e_mng_write_dhcp_info(struct e1000_hw *hw, u8 *buffer, u16 length) }/** -* e1000e_enable_mng_pass_thru - Enable processing of ARP's +* e1000e_enable_mng_pass_thru - Check if management passthrough is needed * @hw: pointer to the HW structure * -* Verifies the hardware needs to allow ARPs to be processed by the host. +* Verifies the hardware needs to leave interface enabled so that frames can +* be directed to and from the management interface. **/ bool e1000e_enable_mng_pass_thru (struct e1000_hw *hw) {
@@ -2528,8 +2529,7 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) manc =er32 (MANC ); -if (!(manc &E1000_MANC_RCV_TCO_EN ) || - !(manc &E1000_MANC_EN_MAC_ADDR_FILTER )) +if (!(manc &E1000_MANC_RCV_TCO_EN ))return ret_val;if (hw->mac.arc_subsystem_valid) {
Re: [net-next-2.6 PATCH 06/12] e1000e: Remove EN_MAC_ADDR_FILTER check from enable_mng_pass_thru check
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:00:50 -0700
Quoted 7 lines
From: Bruce Allan <[email protected]>
Patch addresses issues when manageability passthrough is enabled, but the
MAC_ADDR_FILTERbit is not set in the MANC register.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 7/12 e1000e: Cleanup e1000_sw_lcd_config_ich8lan()
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
After every reset all ICH/PCH parts call this function which acquires the swflag, performs a workaround on applicable parts and releases the swflag. There is no reason for parts for which this workaround is not applicable to acquire and release the swflag so the function should just return without doing anything for these parts. This also provides for the indentation of most of the function contents to be shifted left cleaning up the code.
---
drivers/net/e1000e/ich8lan.c | 152 +++++++++++++++++++++--------------------- 1 files changed, 75 insertions(+), 77 deletions(-)
drivers/net/e1000e/ich8lan.c +75 -77
@@ -815,11 +815,16 @@ static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw)**/ static s32 e1000_sw_lcd_config_ich8lan (struct e1000_hw *hw) { +struct e1000_adapter *adapter = hw->adapter;struct e1000_phy_info *phy = &hw->phy;u32 i, data, cnf_size, cnf_base_addr, sw_cfg_mask; -s32 ret_val; +s32 ret_val =0 ;u16 word_addr, reg_data, reg_addr, phy_page =0 ; +if (!(hw->mac.type == e1000_ich8lan && phy->type == e1000_phy_igp_3) && + !(hw->mac.type == e1000_pchlan)) +return ret_val; + ret_val = hw->phy.ops.acquire (hw);if (ret_val)return ret_val;
@@ -831,97 +836,90 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)* Therefore, after each PHY reset, we will load the * configuration data out of the NVM manually. */ -if ((hw->mac.type == e1000_ich8lan && phy->type == e1000_phy_igp_3) || - (hw->mac.type == e1000_pchlan)) { -struct e1000_adapter *adapter = hw->adapter; - -/* Check if SW needs to configure the PHY */ -if ((adapter->pdev->device ==E1000_DEV_ID_ICH8_IGP_M_AMT ) || - (adapter->pdev->device ==E1000_DEV_ID_ICH8_IGP_M ) || - (hw->mac.type == e1000_pchlan)) - sw_cfg_mask =E1000_FEXTNVM_SW_CONFIG_ICH8M ; -else - sw_cfg_mask =E1000_FEXTNVM_SW_CONFIG ; +if ((adapter->pdev->device ==E1000_DEV_ID_ICH8_IGP_M_AMT ) || + (adapter->pdev->device ==E1000_DEV_ID_ICH8_IGP_M ) || + (hw->mac.type == e1000_pchlan)) + sw_cfg_mask =E1000_FEXTNVM_SW_CONFIG_ICH8M ; +else + sw_cfg_mask =E1000_FEXTNVM_SW_CONFIG ; - data =er32 (FEXTNVM ); -if (!(data & sw_cfg_mask)) - goto out; + data =er32 (FEXTNVM ); +if (!(data & sw_cfg_mask)) + goto out; -/* Wait for basic configuration completes before proceeding */ -e1000_lan_init_done_ich8lan (hw); +/* Wait for basic configuration completes before proceeding */ +e1000_lan_init_done_ich8lan (hw); +/* +* Make sure HW does not configure LCD from PHY +* extended configuration before SW configuration +*/ + data =er32 (EXTCNF_CTRL ); +if (data &E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE ) + goto out; + + cnf_size =er32 (EXTCNF_SIZE ); + cnf_size &=E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK ; + cnf_size >>=E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT ; +if (!cnf_size) + goto out; + + cnf_base_addr = data &E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK ; + cnf_base_addr >>=E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT ; + +if (!(data &E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE ) && + (hw->mac.type == e1000_pchlan)) {/* -* Make sure HW does not configure LCD from PHY -* extended configuration before SW configuration +* HW configures the SMBus address and LEDs when the +* OEM and LCD Write Enable bits are set in the NVM. +* When both NVM bits are cleared, SW will configure +* them instead. */ - data =er32 (EXTCNF_CTRL ); -if (data &E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE ) + data =er32 (STRAP ); + data &=E1000_STRAP_SMBUS_ADDRESS_MASK ; + reg_data = data >>E1000_STRAP_SMBUS_ADDRESS_SHIFT ; + reg_data |=HV_SMB_ADDR_PEC_EN |HV_SMB_ADDR_VALID ; + ret_val =e1000_write_phy_reg_hv_locked (hw,HV_SMB_ADDR , + reg_data); +if (ret_val) goto out; - cnf_size =er32 (EXTCNF_SIZE ); - cnf_size &=E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK ; - cnf_size >>=E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT ; -if (!cnf_size) + data =er32 (LEDCTL ); + ret_val =e1000_write_phy_reg_hv_locked (hw,HV_LED_CONFIG , + (u16 )data); +if (ret_val) goto out; + } - cnf_base_addr = data &E1000_EXTCNF_CTRL_EXT_CNF_POINTER_MASK ; - cnf_base_addr >>=E1000_EXTCNF_CTRL_EXT_CNF_POINTER_SHIFT ; - -if (!(data &E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE ) && - (hw->mac.type == e1000_pchlan)) { -/* -* HW configures the SMBus address and LEDs when the -* OEM and LCD Write Enable bits are set in the NVM. -* When both NVM bits are cleared, SW will configure -* them instead. -*/ - data =er32 (STRAP ); - data &=E1000_STRAP_SMBUS_ADDRESS_MASK ; - reg_data = data >>E1000_STRAP_SMBUS_ADDRESS_SHIFT ; - reg_data |=HV_SMB_ADDR_PEC_EN |HV_SMB_ADDR_VALID ; - ret_val =e1000_write_phy_reg_hv_locked (hw,HV_SMB_ADDR , - reg_data); -if (ret_val) - goto out; - - data =er32 (LEDCTL ); - ret_val =e1000_write_phy_reg_hv_locked (hw, -HV_LED_CONFIG , - (u16 )data); -if (ret_val) - goto out; - } -/* Configure LCD from extended configuration region. */ +/* Configure LCD from extended configuration region. */ -/* cnf_base_addr is in DWORD */ - word_addr = (u16)(cnf_base_addr <<1 ); +/* cnf_base_addr is in DWORD */ + word_addr = (u16)(cnf_base_addr <<1 ); -for (i =0 ; i < cnf_size; i++) { - ret_val =e1000_read_nvm (hw, (word_addr + i *2 ),1 , - ®_data); -if (ret_val) - goto out; +for (i =0 ; i < cnf_size; i++) { + ret_val =e1000_read_nvm (hw, (word_addr + i *2 ),1 , + ®_data); +if (ret_val) + goto out; - ret_val =e1000_read_nvm (hw, (word_addr + i *2 +1 ), -1 , ®_addr); -if (ret_val) - goto out; + ret_val =e1000_read_nvm (hw, (word_addr + i *2 +1 ), +1 , ®_addr); +if (ret_val) + goto out; -/* Save off the PHY page for future writes. */ -if (reg_addr ==IGP01E1000_PHY_PAGE_SELECT ) { - phy_page = reg_data; -continue ; - } +/* Save off the PHY page for future writes. */ +if (reg_addr ==IGP01E1000_PHY_PAGE_SELECT ) { + phy_page = reg_data; +continue ; + } - reg_addr &=PHY_REG_MASK ; - reg_addr |= phy_page; + reg_addr &=PHY_REG_MASK ; + reg_addr |= phy_page; - ret_val = phy->ops.write_reg_locked (hw, - (u32 )reg_addr, - reg_data); -if (ret_val) - goto out; - } + ret_val = phy->ops.write_reg_locked (hw, (u32 )reg_addr, + reg_data); +if (ret_val) + goto out; } out:
Re: [net-next-2.6 PATCH 07/12] e1000e: Cleanup e1000_sw_lcd_config_ich8lan()
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:01:10 -0700
Quoted 10 lines
From: Bruce Allan <[email protected]>
After every reset all ICH/PCH parts call this function which acquires the swflag, performs a workaround on applicable parts and releases the swflag. There is no reason for parts for which this workaround is not applicable to acquire and release the swflag so the function should just return without doing anything for these parts. This also provides for the indentation of most of the function contents to be shifted left cleaning up the code.
Quoted 2 lines
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 8/12 e1000e: Incorrect function pointer set for force_speed_duplex on 82577
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
The force_speed_duplex function pointer was incorrectly set. Instead of calling the 82577-specific version it was calling the m88 version which, among other incorrect things, reset the PHY causing autonegotiation to be re-enabled in the PHY resulting in the link defaulting to half-duplex. The 82577-specific force_speed_duplex function also had an issue where it disabled Auto-MDI-X which caused the link to not come up.
---
drivers/net/e1000e/ich8lan.c | 1 + drivers/net/e1000e/phy.c | 21 +-------------------- 2 files changed, 2 insertions(+), 20 deletions(-)
drivers/net/e1000e/ich8lan.c +1 -0
@@ -330,6 +330,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) phy->ops.get_cable_length = e1000_get_cable_length_82577; phy->ops.get_info = e1000_get_phy_info_82577; phy->ops.commit = e1000e_phy_sw_reset; +break ;case e1000_phy_82578: phy->ops.check_polarity = e1000_check_polarity_m88; phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;
drivers/net/e1000e/phy.c +1 -20
@@ -3116,9 +3116,7 @@ s32 e1000_check_polarity_82577(struct e1000_hw *hw)* e1000_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY * @hw: pointer to the HW structure * -* Calls the PHY setup function to force speed and duplex. Clears the -* auto-crossover to force MDI manually. Waits for link and returns -* successful if link up is successful, else -E1000_ERR_PHY (-2). +* Calls the PHY setup function to force speed and duplex. **/ s32 e1000_phy_force_speed_duplex_82577 (struct e1000_hw *hw) {
@@ -3137,23 +3135,6 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)if (ret_val) goto out; -/* -* Clear Auto-Crossover to force MDI manually. 82577 requires MDI -* forced whenever speed and duplex are forced. -*/ - ret_val = phy->ops.read_reg (hw,I82577_PHY_CTRL_2 , &phy_data); -if (ret_val) - goto out; - - phy_data &= ~I82577_PHY_CTRL2_AUTO_MDIX ; - phy_data &= ~I82577_PHY_CTRL2_FORCE_MDI_MDIX ; - - ret_val = phy->ops.write_reg (hw,I82577_PHY_CTRL_2 , phy_data); -if (ret_val) - goto out; - -e_dbg ("I82577_PHY_CTRL_2: %X\n" , phy_data); -udelay (1 );if (phy->autoneg_wait_to_complete) {
Re: [net-next-2.6 PATCH 08/12] e1000e: Incorrect function pointer set for force_speed_duplex on 82577
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:01:30 -0700
Quoted 11 lines
From: Bruce Allan <[email protected]>
The
force_speed_duplexfunction pointer was incorrectly set. Instead of calling the 82577-specific version it was calling the m88 version which, among other incorrect things, reset the PHY causing autonegotiation to be re-enabled in the PHY resulting in the link defaulting to half-duplex. The 82577-specificforce_speed_duplexfunction also had an issue where it disabled Auto-MDI-X which caused the link to not come up.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 9/12 e1000e: fix checks for manageability enabled and management pass-through
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
The mac->arc_subsystem was being incorrectly used to flag whether or not manageability was enabled when it should only be used to state whether the ARC (Host interface) subsystem is available on a particular MAC _and_ only valid when any manageability is enabled. The ARC subsystem is currently only available on 80003es2lan and 82573 parts supported by the driver.
A new flag, has_fwsm, is introduced to be used when checking if manageability is enabled but only on parts that acutally have an FWSM register. While the above parts have an FWSM register, there are other parts that have FWSM but do not have support for the ARC subsystem, namely 82571/2 and ICHx/PCH.
And then there are parts that have manageability, but do not have either FWSM register or support for the ARC subsystem - these are 82574 and 82583.
For 80003es2lan, 82571/2/3 and ICH/PCH parts, this patch makes no functional changes, it only corrects the usage of the manageability flags. For 82574 and 82583, it fixes the incorrect accesses of the non-existent FWSM register and ARC subsystem as well as corrects the check for management pass-through.
---
drivers/net/e1000e/82571.c | 19 +++++++++++++++---- drivers/net/e1000e/defines.h | 2 ++ drivers/net/e1000e/es2lan.c | 9 ++++++--- drivers/net/e1000e/hw.h | 1 + drivers/net/e1000e/ich8lan.c | 6 ++++-- drivers/net/e1000e/lib.c | 31 ++++++++++++++++++++++++------- 6 files changed, 52 insertions(+), 16 deletions(-)
drivers/net/e1000e/82571.c +15 -4
@@ -234,9 +234,6 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) mac->mta_reg_count =128 ;/* Set rar entry count */ mac->rar_entry_count =E1000_RAR_ENTRIES ; -/* Set if manageability features are enabled. */ - mac->arc_subsystem_valid = (er32 (FWSM ) &E1000_FWSM_MODE_MASK ) - ? true : false;/* Adaptive IFS supported */ mac->adaptive_ifs = true;
@@ -271,6 +268,16 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) func->set_lan_id = e1000_set_lan_id_single_port; func->check_mng_mode = e1000e_check_mng_mode_generic; func->led_on = e1000e_led_on_generic; + +/* FWSM register */ + mac->has_fwsm = true; +/* +* ARC supported; valid only if manageability features are +* enabled. +*/ + mac->arc_subsystem_valid = + (er32 (FWSM ) &E1000_FWSM_MODE_MASK ) + ? true : false;break ;case e1000_82574:case e1000_82583:
@@ -281,6 +288,9 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)default : func->check_mng_mode = e1000e_check_mng_mode_generic; func->led_on = e1000e_led_on_generic; + +/* FWSM register */ + mac->has_fwsm = true;break ; }
@@ -993,9 +1003,10 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)/* ...for both queues. */ switch (mac->type) {case e1000_82573: +e1000e_enable_tx_pkt_filtering (hw); +/* fall through */ case e1000_82574:case e1000_82583: -e1000e_enable_tx_pkt_filtering (hw); reg_data =er32 (GCR ); reg_data |=E1000_GCR_L1_ACT_WITHOUT_L0S_RX ;ew32 (GCR , reg_data);
drivers/net/e1000e/defines.h +2 -0
@@ -629,6 +629,8 @@#define NVM_ALT_MAC_ADDR_PTR 0x0037#define NVM_CHECKSUM_REG 0x003F +#define E1000_NVM_INIT_CTRL2_MNGM 0x6000/* Manageability Operation Mode mask */ +#define E1000_NVM_CFG_DONE_PORT_0 0x40000/* MNG config cycle done */ #define E1000_NVM_CFG_DONE_PORT_1 0x80000/* ...for second port */
drivers/net/e1000e/es2lan.c +6 -3
@@ -221,9 +221,12 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter) mac->mta_reg_count =128 ;/* Set rar entry count */ mac->rar_entry_count =E1000_RAR_ENTRIES ; -/* Set if manageability features are enabled. */ - mac->arc_subsystem_valid = (er32 (FWSM ) &E1000_FWSM_MODE_MASK ) - ? true : false; +/* FWSM register */ + mac->has_fwsm = true; +/* ARC supported; valid only if manageability features are enabled. */ + mac->arc_subsystem_valid = + (er32 (FWSM ) &E1000_FWSM_MODE_MASK ) + ? true : false;/* Adaptive IFS not supported */ mac->adaptive_ifs = false;
drivers/net/e1000e/hw.h +1 -0
@@ -830,6 +830,7 @@ struct e1000_mac_info {u8 forced_speed_duplex;bool adaptive_ifs; +bool has_fwsm;bool arc_subsystem_valid;bool autoneg;bool autoneg_failed;
drivers/net/e1000e/ich8lan.c +4 -2
@@ -503,8 +503,10 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter) mac->rar_entry_count =E1000_ICH_RAR_ENTRIES ;if (mac->type == e1000_ich8lan) mac->rar_entry_count--; -/* Set if manageability features are enabled. */ - mac->arc_subsystem_valid = true; +/* FWSM register */ + mac->has_fwsm = true; +/* ARC subsystem not supported */ + mac->arc_subsystem_valid = false;/* Adaptive IFS supported */ mac->adaptive_ifs = true;
drivers/net/e1000e/lib.c +24 -7
@@ -2272,6 +2272,11 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)u32 hicr;u8 i; +if (!(hw->mac.arc_subsystem_valid)) { +e_dbg ("ARC subsystem not valid.\n" ); +return -E1000_ERR_HOST_INTERFACE_COMMAND ; + } +/* Check that the host interface is enabled. */ hicr =er32 (HICR );if ((hicr &E1000_HICR_EN ) ==0 ) {
@@ -2530,9 +2535,9 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) manc =er32 (MANC );if (!(manc &E1000_MANC_RCV_TCO_EN )) -return ret_val; + goto out; -if (hw->mac.arc_subsystem_valid) { +if (hw->mac.has_fwsm) { fwsm =er32 (FWSM ); factps =er32 (FACTPS );
@@ -2540,16 +2545,28 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) ((fwsm & E1000_FWSM_MODE_MASK) == (e1000_mng_mode_pt << E1000_FWSM_MODE_SHIFT))) { ret_val = true; -return ret_val; + goto out; } - }else { -if ((manc &E1000_MANC_SMBUS_EN ) && - !(manc &E1000_MANC_ASF_EN )) { + }else if ((hw->mac.type == e1000_82574) || + (hw->mac.type == e1000_82583)) { +u16 data; + + factps =er32 (FACTPS ); +e1000_read_nvm (hw,NVM_INIT_CONTROL2_REG ,1 , &data); + +if (!(factps &E1000_FACTPS_MNGCG ) && + ((data &E1000_NVM_INIT_CTRL2_MNGM ) == + (e1000_mng_mode_pt <<13 ))) { ret_val = true; -return ret_val; + goto out; } + }else if ((manc &E1000_MANC_SMBUS_EN ) && + !(manc &E1000_MANC_ASF_EN )) { + ret_val = true; + goto out; } +out:return ret_val; }
Re: [net-next-2.6 PATCH 09/12] e1000e: fix checks for manageability enabled and management pass-through
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:01:51 -0700
Quoted 17 lines
From: Bruce Allan <[email protected]>
The
mac->arc_subsystemwas being incorrectly used to flag whether or not manageability was enabled when it should only be used to state whether the ARC (Host interface) subsystem is available on a particular MAC _and_ only valid when any manageability is enabled. The ARC subsystem is currently only available on 80003es2lan and 82573 parts supported by the driver.A new flag,
has_fwsm, is introduced to be used when checking if manageability is enabled but only on parts that acutally have an FWSM register. While the above parts have an FWSM register, there are other parts that have FWSM but do not have support for the ARC subsystem, namely 82571/2 and ICHx/PCH.And then there are parts that have manageability, but do not have either FWSM register or support for the ARC subsystem - these are 82574 and 82583.
Quoted 8 lines
For 80003es2lan, 82571/2/3 and ICH/PCH parts, this patch makes no functional changes, it only corrects the usage of the manageability flags. For 82574 and 82583, it fixes the incorrect accesses of the non-existent FWSM register and ARC subsystem as well as corrects the check for management pass-through.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 10/12 e1000e: move settting of flow control refresh timer to link setup code
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
The flow control refresh timer value needs to be saved off so that it can be programmed into the approrpiate register when applicable but without a reset, e.g. when changing flow control parameters via ethtool.
---
drivers/net/e1000e/hw.h | 1 + drivers/net/e1000e/ich8lan.c | 2 ++ drivers/net/e1000e/netdev.c | 5 +---- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/e1000e/hw.h +1 -0
@@ -901,6 +901,7 @@ struct e1000_fc_info {u32 high_water;/* Flow control high-water mark */ u32 low_water;/* Flow control low-water mark */ u16 pause_time;/* Flow control pause timer */ +u16 refresh_time;/* Flow control refresh timer */ bool send_xon;/* Flow control send XON */ bool strict_ieee;/* Strict IEEE mode */ enum e1000_fc_mode current_mode;/* FC mode in effect */
drivers/net/e1000e/ich8lan.c +2 -0
@@ -2823,6 +2823,8 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)ew32 (FCTTV , hw->fc.pause_time);if ((hw->phy.type == e1000_phy_82578) || (hw->phy.type == e1000_phy_82577)) { +ew32 (FCRTV_PCH , hw->fc.refresh_time); + ret_val = hw->phy.ops.write_reg (hw,PHY_REG (BM_PORT_CTRL_PAGE ,27 ), hw->fc.pause_time);
drivers/net/e1000e/netdev.c +1 -4
@@ -3134,6 +3134,7 @@ void e1000e_reset(struct e1000_adapter *adapter) fc->high_water =0x5000 ; fc->low_water =0x3000 ; } + fc->refresh_time =0x1000 ; }else {if ((adapter->flags &FLAG_HAS_ERT ) && (adapter->netdev->mtu >ETH_DATA_LEN ))
@@ -3171,10 +3172,6 @@ void e1000e_reset(struct e1000_adapter *adapter)if (mac->ops.init_hw (hw))e_err ("Hardware Error\n" ); -/* additional part of the flow-control workaround above */ -if (hw->mac.type == e1000_pchlan) -ew32 (FCRTV_PCH ,0x1000 ); -e1000_update_mng_vlan (adapter);/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
Re: [net-next-2.6 PATCH 10/12] e1000e: move settting of flow control refresh timer to link setup code
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:02:12 -0700
Quoted 8 lines
From: Bruce Allan <[email protected]>
The flow control refresh timer value needs to be saved off so that it can be programmed into the approrpiate register when applicable but without a reset, e.g. when changing flow control parameters via ethtool.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 11/12 e1000e: Fix/cleanup PHY reset code for ICHx/PCHx
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
i) Fixes a bug where e1000_sw_lcd_config_ich8lan() was calling e1000_lan_init_done_ich8lan() to poll the STATUS.LAN_INIT_DONE bit to make sure the MAC had completed the PHY configuration. However, e1000_lan_init_done_ich8lan() had already been called in one of the two places where PHY reset occurs for ICHx/PCHx parts, which caused the second call to busy-wait for 150 msec because the LAN_INIT_DONE bit had already been checked and cleared.
ii) Cleanup the two separate PHY reset code paths, i.e. the full-chip reset in e1000_reset_hw_ich8lan() and the PHY-only reset in e1000_phy_hw_reset_ich8lan(). There was duplicate code in both paths to be performed post-reset that are now combined into one new function - e1000_post_phy_reset_ich8lan(). This cleanup also included moving the clearing of the PHY Reset Asserted bit in the STATUS register (now done for all ICH/PCH parts) and the check for the indication from h/w that basic configuration has completed back to where it previously was in e1000_get_cfg_done_ich8lan().
iii) Corrected a few comments
---
drivers/net/e1000e/ich8lan.c | 149 +++++++++++++++++++++--------------------- 1 files changed, 75 insertions(+), 74 deletions(-)
drivers/net/e1000e/ich8lan.c +75 -74
@@ -850,9 +850,6 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw)if (!(data & sw_cfg_mask)) goto out; -/* Wait for basic configuration completes before proceeding */ -e1000_lan_init_done_ich8lan (hw); -/* * Make sure HW does not configure LCD from PHY * extended configuration before SW configuration
@@ -1260,30 +1257,26 @@ static void e1000_lan_init_done_ich8lan(struct e1000_hw *hw) }/** -* e1000_phy_hw_reset_ich8lan - Performs a PHY reset +* e1000_post_phy_reset_ich8lan - Perform steps required after a PHY reset * @hw: pointer to the HW structure -* -* Resets the PHY -* This is a function pointer entry point called by drivers -* or other shared routines. **/ -static s32 e1000_phy_hw_reset_ich8lan (struct e1000_hw *hw) +static s32 e1000_post_phy_reset_ich8lan (struct e1000_hw *hw) {s32 ret_val =0 ;u16 reg; - ret_val =e1000e_phy_hw_reset_generic (hw); -if (ret_val) -return ret_val; - -/* Allow time for h/w to get to a quiescent state after reset */ -mdelay (10 ); +if (e1000_check_reset_block (hw)) + goto out;/* Perform any necessary post-reset workarounds */ -if (hw->mac.type == e1000_pchlan) { +switch (hw->mac.type) { +case e1000_pchlan: ret_val =e1000_hv_phy_workarounds_ich8lan (hw);if (ret_val) -return ret_val; + goto out; +break ; +default : +break ; }/* Dummy read to clear the phy wakeup bit after lcd reset */
@@ -1296,11 +1289,32 @@ static s32 e1000_phy_hw_reset_ich8lan(struct e1000_hw *hw) goto out;/* Configure the LCD with the OEM bits in NVM */ -if (hw->mac.type == e1000_pchlan) - ret_val =e1000_oem_bits_config_ich8lan (hw, true); + ret_val =e1000_oem_bits_config_ich8lan (hw, true); out: -return 0 ; +return ret_val; +} + +/** +* e1000_phy_hw_reset_ich8lan - Performs a PHY reset +* @hw: pointer to the HW structure +* +* Resets the PHY +* This is a function pointer entry point called by drivers +* or other shared routines. +**/ +static s32 e1000_phy_hw_reset_ich8lan (struct e1000_hw *hw) +{ +s32 ret_val =0 ; + + ret_val =e1000e_phy_hw_reset_generic (hw); +if (ret_val) + goto out; + + ret_val =e1000_post_phy_reset_ich8lan (hw); + +out: +return ret_val; }/**
@@ -2511,9 +2525,8 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)* on the last TLP read/write transaction when MAC is reset. */ ret_val =e1000e_disable_pcie_master (hw); -if (ret_val) { +if (ret_val)e_dbg ("PCI-E Master disable polling has failed.\n" ); - }e_dbg ("Masking off all interrupts\n" );ew32 (IMC ,0xffffffff );
@@ -2552,14 +2565,8 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) ctrl =er32 (CTRL );if (!e1000_check_reset_block (hw)) { -/* Clear PHY Reset Asserted bit */ -if (hw->mac.type >= e1000_pchlan) { -u32 status =er32 (STATUS ); -ew32 (STATUS , status & ~E1000_STATUS_PHYRA ); - } -/* -* PHY HW reset requires MAC CORE reset at the same +* Full-chip reset requires MAC and PHY reset at the same * time to make sure the interface between MAC and the * external PHY is reset. */
@@ -2573,39 +2580,16 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)if (!ret_val)e1000_release_swflag_ich8lan (hw); -/* Perform any necessary post-reset workarounds */ -if (hw->mac.type == e1000_pchlan) - ret_val =e1000_hv_phy_workarounds_ich8lan (hw); - -if (ctrl &E1000_CTRL_PHY_RST ) +if (ctrl &E1000_CTRL_PHY_RST ) { ret_val = hw->phy.ops.get_cfg_done (hw); +if (ret_val) + goto out; -if (hw->mac.type >= e1000_ich10lan) { -e1000_lan_init_done_ich8lan (hw); - }else { - ret_val =e1000e_get_auto_rd_done (hw); -if (ret_val) { -/* -* When auto config read does not complete, do not -* return with an error. This can happen in situations -* where there is no eeprom and prevents getting link. -*/ -e_dbg ("Auto Read Done did not complete\n" ); - } - } -/* Dummy read to clear the phy wakeup bit after lcd reset */ -if (hw->mac.type == e1000_pchlan) -e1e_rphy (hw,BM_WUC , ®); - - ret_val =e1000_sw_lcd_config_ich8lan (hw); -if (ret_val) - goto out; - -if (hw->mac.type == e1000_pchlan) { - ret_val =e1000_oem_bits_config_ich8lan (hw, true); + ret_val =e1000_post_phy_reset_ich8lan (hw);if (ret_val) goto out; } +/* * For PCH, this write will make sure that any noise * will be detected as a CRC error and be dropped rather than show up
@@ -3291,33 +3275,50 @@ static s32 e1000_led_off_pchlan(struct e1000_hw *hw) }/** -* e1000_get_cfg_done_ich8lan - Read config done bit +* e1000_get_cfg_done_ich8lan - Read config done bit after Full or PHY reset * @hw: pointer to the HW structure * -* Read the management control register for the config done bit for -* completion status. NOTE: silicon which is EEPROM-less will fail trying -* to read the config done bit, so an error is *ONLY* logged and returns -* 0. If we were to return with error, EEPROM-less silicon -* would not be able to be reset or change link. +* Read appropriate register for the config done bit for completion status +* and configure the PHY through s/w for EEPROM-less parts. +* +* NOTE: some silicon which is EEPROM-less will fail trying to read the +* config done bit, so only an error is logged and continues. If we were +* to return with error, EEPROM-less silicon would not be able to be reset +* or change link. **/ static s32 e1000_get_cfg_done_ich8lan (struct e1000_hw *hw) { +s32 ret_val =0 ;u32 bank =0 ; +u32 status; -if (hw->mac.type >= e1000_pchlan) { -u32 status =er32 (STATUS ); +e1000e_get_cfg_done (hw); -if (status &E1000_STATUS_PHYRA ) -ew32 (STATUS , status & ~E1000_STATUS_PHYRA ); -else -e_dbg ("PHY Reset Asserted not set - needs delay\n" ); +/* Wait for indication from h/w that it has completed basic config */ +if (hw->mac.type >= e1000_ich10lan) { +e1000_lan_init_done_ich8lan (hw); + }else { + ret_val =e1000e_get_auto_rd_done (hw); +if (ret_val) { +/* +* When auto config read does not complete, do not +* return with an error. This can happen in situations +* where there is no eeprom and prevents getting link. +*/ +e_dbg ("Auto Read Done did not complete\n" ); + ret_val =0 ; + } } -e1000e_get_cfg_done (hw); +/* Clear PHY Reset Asserted bit */ + status =er32 (STATUS ); +if (status &E1000_STATUS_PHYRA ) +ew32 (STATUS , status & ~E1000_STATUS_PHYRA ); +else +e_dbg ("PHY Reset Asserted not set - needs delay\n" );/* If EEPROM is not marked present, init the IGP 3 PHY manually */ -if ((hw->mac.type != e1000_ich10lan) && - (hw->mac.type != e1000_pchlan)) { +if (hw->mac.type <= e1000_ich9lan) {if (((er32 (EECD ) &E1000_EECD_PRES ) ==0 ) && (hw->phy.type == e1000_phy_igp_3)) {e1000e_phy_init_script_igp3 (hw);
@@ -3326,11 +3327,11 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)if (e1000_valid_nvm_bank_detect_ich8lan (hw, &bank)) {/* Maybe we should do a basic PHY config */ e_dbg ("EEPROM not present\n" ); -return -E1000_ERR_CONFIG ; + ret_val = -E1000_ERR_CONFIG ; } } -return 0 ; +return ret_val; }/**
Re: [net-next-2.6 PATCH 11/12] e1000e: Fix/cleanup PHY reset code for ICHx/PCHx
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:02:32 -0700
Quoted 20 lines
From: Bruce Allan <[email protected]>
i) Fixes a bug where
e1000_sw_lcd_config_ich8lan()was callinge1000_lan_init_done_ich8lan()to poll the STATUS.LAN_INIT_DONE bit to make sure the MAC had completed the PHY configuration. However,e1000_lan_init_done_ich8lan()had already been called in one of the two places where PHY reset occurs for ICHx/PCHx parts, which caused the second call to busy-wait for 150 msec because theLAN_INIT_DONEbit had already been checked and cleared.ii) Cleanup the two separate PHY reset code paths, i.e. the full-chip reset in
e1000_reset_hw_ich8lan()and the PHY-only reset ine1000_phy_hw_reset_ich8lan(). There was duplicate code in both paths to be performed post-reset that are now combined into one new function -e1000_post_phy_reset_ich8lan(). This cleanup also included moving the clearing of the PHY Reset Asserted bit in the STATUS register (now done for all ICH/PCH parts) and the check for the indication from h/w that basic configuration has completed back to where it previously was ine1000_get_cfg_done_ich8lan().
Quoted 4 lines
iii) Corrected a few comments
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 12/12 e1000e: add PCI device id to enable support for 82567V-4
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
---
drivers/net/e1000e/hw.h | 1 + drivers/net/e1000e/netdev.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/e1000e/hw.h +1 -0
@@ -382,6 +382,7 @@ 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_ICH10_D_BM_V 0x1525#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
drivers/net/e1000e/netdev.c +1 -0
@@ -5894,6 +5894,7 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LM), board_ich10lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_LF), board_ich10lan }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_ICH10_D_BM_V), board_ich10lan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LM), board_pchlan }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_M_HV_LC), board_pchlan },
Re: [net-next-2.6 PATCH 12/12] e1000e: add PCI device id to enable support for 82567V-4
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 18:02:52 -0700
Quoted 4 lines
From: Bruce Allan <[email protected]>
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Mon, 10 May 2010 17:59:10 -0700
Quoted 7 lines
From: Bruce Allan <[email protected]>
A couple stack cleanups missed in an earlier patch from Jesse.
Signed-off-by Bruce Allan <[email protected]>Cc Jesse Brandeburg <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.