igc: Add PHY power management control
Subsystems (2)
PATCH v3 1/1 igc: Add PHY power management control
PHY power management control should provide a reliable and accurate indication of PHY reset completion and decrease the delay time after a PHY reset
v1 -> v2: add hw_dbg print for a timeout
v2 -> v3: address some community comments
--- drivers/net/ethernet/intel/igc/igc_defines.h | 1 + drivers/net/ethernet/intel/igc/igc_phy.c | 16 +++++++++++++++- drivers/net/ethernet/intel/igc/igc_regs.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igc/igc_defines.h +1 -0
@@ -464,6 +464,7 @@/* PHY Status Register */ #define MII_SR_LINK_STATUS 0x0004/* Link Status 1 = link */ #define MII_SR_AUTONEG_COMPLETE 0x0020/* Auto Neg Complete */ +#define IGC_PHY_RST_COMP 0x0100/* Internal PHY reset completion */ /* PHY 1000 MII Register/Bit Definitions */ /* PHY Registers defined by IEEE */
drivers/net/ethernet/intel/igc/igc_phy.c +15 -1
@@ -173,6 +173,7 @@ s32 igc_check_downshift(struct igc_hw *hw)s32 igc_phy_hw_reset (struct igc_hw *hw) {struct igc_phy_info *phy = &hw->phy; +u32 phpm =0 , timeout =10000 ;s32 ret_val;u32 ctrl;
@@ -186,6 +187,8 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)if (ret_val) goto out; + phpm =rd32 (IGC_I225_PHPM ); + ctrl =rd32 (IGC_CTRL );wr32 (IGC_CTRL , ctrl |IGC_CTRL_PHY_RST );wrfl ();
@@ -195,7 +198,18 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)wr32 (IGC_CTRL , ctrl);wrfl (); -usleep_range (1500 ,2000 ); +/* SW should guarantee 100us for the completion of the PHY reset */ +usleep_range (100 ,150 ); +do { + phpm =rd32 (IGC_I225_PHPM ); + timeout--; +udelay (1 ); + }while (!(phpm &IGC_PHY_RST_COMP ) && timeout); + +if (!timeout) +hw_dbg ("Timeout is expired after a phy reset\n" ); + +usleep_range (100 ,150 ); phy->ops.release (hw);
drivers/net/ethernet/intel/igc/igc_regs.h +1 -0
@@ -12,6 +12,7 @@#define IGC_MDIC 0x00020/* MDI Control - RW */ #define IGC_MDICNFG 0x00E04/* MDC/MDIO Configuration - RW */ #define IGC_CONNSW 0x00034/* Copper/Fiber switch control - RW */ +#define IGC_I225_PHPM 0x00E14/* I225 PHY Power Management */ /* Internal Packet Buffer Size Registers */ #define IGC_RXPBS 0x02404/* Rx Packet Buffer Size - RW */
Signature · 1 line
2.11.0
Brown
PATCH v3 1/1 igc: Add PHY power management control
Quoted 13 lines
From: Intel-wired-lan <[email protected]> On Behalf Of Sasha Neftin
Sent: Wednesday, January 8, 2020 12:19 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v3] igc: Add PHY power management controlPHY power management control should provide a reliable and accurate indication of PHY reset completion and decrease the delay time after a PHY reset
v1 -> v2: add
hw_dbgprint for a timeout
v2 -> v3: address some community comments
Quoted 7 lines
Signed-off-by Sasha Neftin <[email protected]>--- drivers/net/ethernet/intel/igc/igc_defines.h | 1 + drivers/net/ethernet/intel/igc/igc_phy.c | 16 +++++++++++++++- drivers/net/ethernet/intel/igc/igc_regs.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-)