e1000e: minor correction to name of bit in CTRL_EXT register
Subsystems (2)
PATCH 1/3 e1000e: minor correction to name of bit in CTRL_EXT register
From: Bruce Allan <[email protected]>
Bit 7 in the CTRL_REG register is actually the Software Definable Pin 3, not the Software Definable Pin 7.
---
drivers/net/e1000e/defines.h | 2 +- drivers/net/e1000e/netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000e/defines.h +1 -1
@@ -74,7 +74,7 @@#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_SDP3_DATA 0x00000080/* Value of SW Definable Pin 3 */ #define E1000_CTRL_EXT_EE_RST 0x00002000/* Reinitialize from EEPROM */ #define E1000_CTRL_EXT_SPD_BYPS 0x00008000/* Speed Select Bypass */ #define E1000_CTRL_EXT_RO_DIS 0x00020000/* Relaxed Ordering disable */
drivers/net/e1000e/netdev.c +1 -1
@@ -4541,7 +4541,7 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool *enable_wake) e1000_media_type_internal_serdes) {/* keep the laser running in D3 */ ctrl_ext =er32 (CTRL_EXT ); - ctrl_ext |=E1000_CTRL_EXT_SDP7_DATA ; + ctrl_ext |=E1000_CTRL_EXT_SDP3_DATA ;ew32 (CTRL_EXT , ctrl_ext); }
PATCH 2/3 e1000e: replace incorrect use of GG82563_REG macro
From: Bruce Allan <[email protected]>
The GG82563_REG() macro should not be used to determine the offset provided to the e1000e_[read|write]_kmrn_reg() functions since the first argument to the macro is already implied and gets masked off anyway in the functions. The resultant register reads/writes with this patch are functionally the same as before.
---
drivers/net/e1000e/hw.h | 2 ++ drivers/net/e1000e/ich8lan.c | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/net/e1000e/hw.h +2 -0
@@ -302,6 +302,8 @@ enum e1e_registers {#define E1000_KMRNCTRLSTA_OFFSET_SHIFT 16#define E1000_KMRNCTRLSTA_REN 0x00200000#define E1000_KMRNCTRLSTA_DIAG_OFFSET 0x3/* Kumeran Diagnostic */ +#define E1000_KMRNCTRLSTA_TIMEOUTS 0x4/* Kumeran Timeouts */ +#define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9/* Kumeran InBand Parameters */ #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000/* Nearend Loopback mode */ #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7#define E1000_KMRNCTRLSTA_K1_ENABLE 0x140E
drivers/net/e1000e/ich8lan.c +5 -3
@@ -2755,14 +2755,16 @@ static s32 e1000_setup_copper_link_ich8lan(struct e1000_hw *hw)* and increase the max iterations when polling the phy; * this fixes erroneous timeouts at 10Mbps. */ - ret_val =e1000e_write_kmrn_reg (hw,GG82563_REG (0x34 ,4 ),0xFFFF ); + ret_val =e1000e_write_kmrn_reg (hw,E1000_KMRNCTRLSTA_TIMEOUTS ,0xFFFF );if (ret_val)return ret_val; - ret_val =e1000e_read_kmrn_reg (hw,GG82563_REG (0x34 ,9 ), ®_data); + ret_val =e1000e_read_kmrn_reg (hw,E1000_KMRNCTRLSTA_INBAND_PARAM , + ®_data);if (ret_val)return ret_val; reg_data |=0x3F ; - ret_val =e1000e_write_kmrn_reg (hw,GG82563_REG (0x34 ,9 ), reg_data); + ret_val =e1000e_write_kmrn_reg (hw,E1000_KMRNCTRLSTA_INBAND_PARAM , + reg_data);if (ret_val)return ret_val;
Re: [PATCH 2/3] e1000e: replace incorrect use of GG82563_REG macro
From: Jeff Kirsher <[email protected]>
Date: Tue, 08 Dec 2009 09:28:01 -0800
Quoted 10 lines
From: Bruce Allan <[email protected]>
The
GG82563_REG()macro should not be used to determine the offset provided to the e1000e_[read|write]_kmrn_reg() functions since the first argument to the macro is already implied and gets masked off anyway in the functions. The resultant register reads/writes with this patch are functionally the same as before.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/3 e1000e: only perform ESB2 MDIC workaround on certain configurations
In reply to Jeff KirsherFrom: Bruce Allan <[email protected]>
A workaround added for all ESB2 devices (adds a delay for all MDIC accesses which resolves an issue with the MDIC ready bit being set prematurely) is applicable only to devices in which the MAC-PHY interconnect is not operating in a certain mode with in-band MDIO. Check the control register for the operating mode and enable the workaround accordingly.
---
drivers/net/e1000e/es2lan.c | 97 ++++++++++++++++++++++++++++--------------- drivers/net/e1000e/hw.h | 5 ++ 2 files changed, 69 insertions(+), 33 deletions(-)
drivers/net/e1000e/es2lan.c +64 -33
@@ -46,6 +46,9 @@#define E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT 0x0000#define E1000_KMRNCTRLSTA_OPMODE_E_IDLE 0x2000 +#define E1000_KMRNCTRLSTA_OPMODE_MASK 0x000C +#define E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO 0x0004 +#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00/* Gigabit Carry Extend Padding */ #define DEFAULT_TCTL_EXT_GCEX_80003ES2LAN 0x00010000
@@ -462,28 +465,36 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,return ret_val; } -/* -* The "ready" bit in the MDIC register may be incorrectly set -* before the device has completed the "Page Select" MDI -* transaction. So we wait 200us after each MDI command... -*/ -udelay (200 ); +if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) { +/* +* The "ready" bit in the MDIC register may be incorrectly set +* before the device has completed the "Page Select" MDI +* transaction. So we wait 200us after each MDI command... +*/ +udelay (200 ); -/* ...and verify the command was successful. */ - ret_val =e1000e_read_phy_reg_mdic (hw, page_select, &temp); +/* ...and verify the command was successful. */ + ret_val =e1000e_read_phy_reg_mdic (hw, page_select, &temp); -if (((u16 )offset >>GG82563_PAGE_SHIFT ) != temp) { - ret_val = -E1000_ERR_PHY ; -e1000_release_phy_80003es2lan (hw); -return ret_val; - } +if (((u16 )offset >>GG82563_PAGE_SHIFT ) != temp) { + ret_val = -E1000_ERR_PHY ; +e1000_release_phy_80003es2lan (hw); +return ret_val; + } -udelay (200 ); +udelay (200 ); - ret_val =e1000e_read_phy_reg_mdic (hw,MAX_PHY_REG_ADDRESS & offset, - data); + ret_val =e1000e_read_phy_reg_mdic (hw, +MAX_PHY_REG_ADDRESS & offset, + data); + +udelay (200 ); + }else { + ret_val =e1000e_read_phy_reg_mdic (hw, +MAX_PHY_REG_ADDRESS & offset, + data); + } -udelay (200 );e1000_release_phy_80003es2lan (hw);return ret_val;
@@ -526,28 +537,35 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,return ret_val; } +if (hw->dev_spec.e80003es2lan.mdic_wa_enable == true) { +/* +* The "ready" bit in the MDIC register may be incorrectly set +* before the device has completed the "Page Select" MDI +* transaction. So we wait 200us after each MDI command... +*/ +udelay (200 ); -/* -* The "ready" bit in the MDIC register may be incorrectly set -* before the device has completed the "Page Select" MDI -* transaction. So we wait 200us after each MDI command... -*/ -udelay (200 ); +/* ...and verify the command was successful. */ + ret_val =e1000e_read_phy_reg_mdic (hw, page_select, &temp); -/* ...and verify the command was successful. */ - ret_val =e1000e_read_phy_reg_mdic (hw, page_select, &temp); +if (((u16 )offset >>GG82563_PAGE_SHIFT ) != temp) { +e1000_release_phy_80003es2lan (hw); +return -E1000_ERR_PHY ; + } -if (((u16 )offset >>GG82563_PAGE_SHIFT ) != temp) { -e1000_release_phy_80003es2lan (hw); -return -E1000_ERR_PHY ; - } +udelay (200 ); -udelay (200 ); + ret_val =e1000e_write_phy_reg_mdic (hw, +MAX_PHY_REG_ADDRESS & offset, + data); - ret_val =e1000e_write_phy_reg_mdic (hw,MAX_PHY_REG_ADDRESS & offset, - data); +udelay (200 ); + }else { + ret_val =e1000e_write_phy_reg_mdic (hw, +MAX_PHY_REG_ADDRESS & offset, + data); + } -udelay (200 );e1000_release_phy_80003es2lan (hw);return ret_val;
@@ -866,6 +884,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) reg_data &= ~0x00100000 ;E1000_WRITE_REG_ARRAY (hw,E1000_FFLT ,0x0001 , reg_data); +/* default to true to enable the MDIC W/A */ + hw->dev_spec.e80003es2lan.mdic_wa_enable = true; + + ret_val =e1000_read_kmrn_reg_80003es2lan (hw, +E1000_KMRNCTRLSTA_OFFSET >> +E1000_KMRNCTRLSTA_OFFSET_SHIFT , + &i); +if (!ret_val) { +if ((i &E1000_KMRNCTRLSTA_OPMODE_MASK ) == +E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO ) + hw->dev_spec.e80003es2lan.mdic_wa_enable = false; + } +/* * Clear all of the statistics registers (clear on read). It is * important that we do this after we have tried to establish link
drivers/net/e1000e/hw.h +5 -0
@@ -900,6 +900,10 @@ struct e1000_dev_spec_82571 {u32 smb_counter; }; +struct e1000_dev_spec_80003es2lan { +bool mdic_wa_enable; +}; +struct e1000_shadow_ram {u16 value;bool modified;
@@ -928,6 +932,7 @@ struct e1000_hw {union {struct e1000_dev_spec_82571 e82571; +struct e1000_dev_spec_80003es2lan e80003es2lan;struct e1000_dev_spec_ich8lan ich8lan; } dev_spec; };
Re: [PATCH 3/3] e1000e: only perform ESB2 MDIC workaround on certain configurations
From: Jeff Kirsher <[email protected]>
Date: Tue, 08 Dec 2009 09:28:20 -0800
Quoted 10 lines
From: Bruce Allan <[email protected]>
A workaround added for all ESB2 devices (adds a delay for all MDIC accesses which resolves an issue with the MDIC ready bit being set prematurely) is applicable only to devices in which the MAC-PHY interconnect is not operating in a certain mode with in-band MDIO. Check the control register for the operating mode and enable the workaround accordingly.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Tue, 08 Dec 2009 09:27:41 -0800
Quoted 7 lines
From: Bruce Allan <[email protected]>
Bit 7 in the
CTRL_REGregister is actually the Software Definable Pin 3, not the Software Definable Pin 7.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.