e1000e: reset MAC-PHY interconnect on 82577/82578 during Sx->S0
Subsystems (2)
PATCH 1/2 e1000e: reset MAC-PHY interconnect on 82577/82578 during Sx->S0
From: Bruce Allan <[email protected]>
During Sx->S0 transitions, the interconnect between the MAC and PHY on 82577/82578 can remain in SMBus mode instead of transitioning to the PCIe-like mode required during normal operation. Toggling the LANPHYPC Value bit essentially resets the interconnect forcing it to the correct mode.
---
drivers/net/e1000e/defines.h | 2 ++ drivers/net/e1000e/ich8lan.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-)
drivers/net/e1000e/defines.h +2 -0
@@ -214,6 +214,8 @@#define E1000_CTRL_SPD_1000 0x00000200/* Force 1Gb */ #define E1000_CTRL_FRCSPD 0x00000800/* Force Speed */ #define E1000_CTRL_FRCDPX 0x00001000/* Force Duplex */ +#define E1000_CTRL_LANPHYPC_OVERRIDE 0x00010000/* SW control of LANPHYPC */ +#define E1000_CTRL_LANPHYPC_VALUE 0x00020000/* SW value of LANPHYPC */ #define E1000_CTRL_SWDPIN0 0x00040000/* SWDPIN 0 value */ #define E1000_CTRL_SWDPIN1 0x00080000/* SWDPIN 1 value */ #define E1000_CTRL_SWDPIO0 0x00400000/* SWDPIN 0 Input or output */
drivers/net/e1000e/ich8lan.c +20 -0
@@ -83,6 +83,8 @@#define E1000_ICH_FWSM_RSPCIPHY 0x00000040/* Reset PHY on PCI Reset */ +/* FW established a valid mode */ +#define E1000_ICH_FWSM_FW_VALID 0x00008000#define E1000_ICH_MNG_IAMT_MODE 0x2
@@ -259,6 +261,7 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)static s32 e1000_init_phy_params_pchlan (struct e1000_hw *hw) {struct e1000_phy_info *phy = &hw->phy; +u32 ctrl;s32 ret_val =0 ; phy->addr =1 ;
@@ -274,6 +277,23 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) phy->ops.power_down = e1000_power_down_phy_copper_ich8lan; phy->autoneg_mask =AUTONEG_ADVERTISE_SPEED_DEFAULT ; +if (!(er32 (FWSM ) &E1000_ICH_FWSM_FW_VALID )) { +/* +* The MAC-PHY interconnect may still be in SMBus mode +* after Sx->S0. Toggle the LANPHYPC Value bit to force +* the interconnect to PCIe mode, but only if there is no +* firmware present otherwise firmware will have done it. +*/ + ctrl =er32 (CTRL ); + ctrl |=E1000_CTRL_LANPHYPC_OVERRIDE ; + ctrl &= ~E1000_CTRL_LANPHYPC_VALUE ; +ew32 (CTRL , ctrl); +udelay (10 ); + ctrl &= ~E1000_CTRL_LANPHYPC_OVERRIDE ; +ew32 (CTRL , ctrl); +msleep (50 ); + } + phy->id = e1000_phy_unknown; ret_val =e1000e_get_phy_id (hw);if (ret_val)
PATCH 2/2 e1000e: Reset 82577/82578 PHY before first PHY register read
From: Bruce Allan <[email protected]>
Reset the PHY before first accessing it. Doing so, ensure that the PHY is in a known good state before we read/write PHY registers. This fixes a driver probe failure.
---
drivers/net/e1000e/ich8lan.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
drivers/net/e1000e/ich8lan.c +10 -0
@@ -294,6 +294,16 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)msleep (50 ); } +/* +* Reset the PHY before any acccess to it. Doing so, ensures that +* the PHY is in a known good state before we read/write PHY registers. +* The generic reset is sufficient here, because we haven't determined +* the PHY type yet. +*/ + ret_val =e1000e_phy_hw_reset_generic (hw); +if (ret_val) + goto out; + phy->id = e1000_phy_unknown; ret_val =e1000e_get_phy_id (hw);if (ret_val)
Re: [net-next-2.6 PATCH 2/2] e1000e: Reset 82577/82578 PHY before first PHY register read
From: Jeff Kirsher <[email protected]>
Date: Thu, 06 May 2010 01:00:27 -0700
Quoted 8 lines
From: Bruce Allan <[email protected]>
Reset the PHY before first accessing it. Doing so, ensure that the PHY is in a known good state before we read/write PHY registers. This fixes a driver probe failure.
Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Thu, 06 May 2010 01:00:06 -0700
Quoted 10 lines
From: Bruce Allan <[email protected]>
During
Sx->S0transitions, the interconnect between the MAC and PHY on 82577/82578 can remain in SMBus mode instead of transitioning to the PCIe-like mode required during normal operation. Toggling the LANPHYPC Value bit essentially resets the interconnect forcing it to the correct mode.Signed-off-by Bruce Allan <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.