Skip to contentSkip to conversation

igc: Add PHY power management control

PATCH Superseded Sasha Neftin 3 participants 5 messages Dec 12, 2019 – Dec 26, 2019

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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

---
 drivers/net/ethernet/intel/igc/igc_defines.h |  1 +
 drivers/net/ethernet/intel/igc/igc_phy.c     | 12 ++++++++++++
 drivers/net/ethernet/intel/igc/igc_regs.h    |  1 +
 3 files changed, 14 insertions(+)
drivers/net/ethernet/intel/igc/igc_defines.h +1 -0
index 2121fc34e300..71a4b0281c03 100644
@@ -460,6 +460,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 +12 -0
index f4b05af0dd2f..a5483368690a 100644
@@ -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,6 +198,15 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)
 	wr32(IGC_CTRL, ctrl);
 	wrfl();
 
+	do {
+		phpm = rd32(IGC_I225_PHPM);
+		timeout--;
+		udelay(1);
+	} while (!(phpm & IGC_PHY_RST_COMP) && timeout);
+
+	if (!timeout)
+		hw_dbg("Timeoui is expired after a phy reset\n");
+
 	usleep_range(1500, 2000);
 
 	phy->ops.release(hw);
drivers/net/ethernet/intel/igc/igc_regs.h +1 -0
index c82111051898..164c42b39dfa 100644
@@ -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
#1 lore raw

PATCH v2 1/1 igc: Add PHY power management control

Quoted 48 lines · Sasha Neftin

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

---
 drivers/net/ethernet/intel/igc/igc_defines.h |  1 +
 drivers/net/ethernet/intel/igc/igc_phy.c     | 12 ++++++++++++
 drivers/net/ethernet/intel/igc/igc_regs.h    |  1 +
 3 files changed, 14 insertions(+)
drivers/net/ethernet/intel/igc/igc_defines.h +1 -0
index 2121fc34e300..71a4b0281c03 100644
@@ -460,6 +460,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 +3 -0
index f4b05af0dd2f..a5483368690a 100644
@@ -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,6 +198,15 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)
 	wr32(IGC_CTRL, ctrl);

drivers/net/ethernet/intel/igc/igc_phy.c s32 igc_phy_hw_reset(struct igc_hw *hw) · line 208

Quoted 10 lines
drivers/net/ethernet/intel/igc/igc_phy.c +8 -0
 	wrfl();
 
+	do {
+		phpm = rd32(IGC_I225_PHPM);
+		timeout--;
+		udelay(1);
+	} while (!(phpm & IGC_PHY_RST_COMP) && timeout);
+
+	if (!timeout)
+		hw_dbg("Timeoui is expired after a phy reset\n");

nitpick: Timeoui -> Timeout

#2 lore raw

PATCH v2 1/1 igc: Add PHY power management control

Quoted 53 lines · Vinicius Costa Gomes
Quoted 50 lines · Sasha Neftin

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

---
  drivers/net/ethernet/intel/igc/igc_defines.h |  1 +
  drivers/net/ethernet/intel/igc/igc_phy.c     | 12 ++++++++++++
  drivers/net/ethernet/intel/igc/igc_regs.h    |  1 +
  3 files changed, 14 insertions(+)
drivers/net/ethernet/intel/igc/igc_defines.h +1 -0
index 2121fc34e300..71a4b0281c03 100644
@@ -460,6 +460,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 +3 -0
index f4b05af0dd2f..a5483368690a 100644
@@ -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,6 +198,15 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)
  	wr32(IGC_CTRL, ctrl);
  	wrfl();
 
Quoted 11 lines

drivers/net/ethernet/intel/igc/igc_phy.c s32 igc_phy_hw_reset(struct igc_hw *hw) · line 208

Quoted 8 lines
drivers/net/ethernet/intel/igc/igc_phy.c +8 -0
+	do {
+		phpm = rd32(IGC_I225_PHPM);
+		timeout--;
+		udelay(1);
+	} while (!(phpm & IGC_PHY_RST_COMP) && timeout);
+
+	if (!timeout)
+		hw_dbg("Timeoui is expired after a phy reset\n");

nitpick: Timeoui -> Timeout

thanks - I will send v3 and fix the typo

#3 lore raw

PATCH v2 1/1 igc: Add PHY power management control

Quoted 63 lines · Sasha
Quoted 53 lines · Vinicius Costa Gomes
Quoted 50 lines · Sasha Neftin

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

---

? drivers/net/ethernet/intel/igc/igc_defines.h |? 1 +
? drivers/net/ethernet/intel/igc/igc_phy.c???? | 12 ++++++++++++
? drivers/net/ethernet/intel/igc/igc_regs.h??? |? 1 +

? 3 files changed, 14 insertions(+)

drivers/net/ethernet/intel/igc/igc_defines.h +0 -0
index 2121fc34e300..71a4b0281c03 100644
@@ -460,6 +460,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 +5 -0
index f4b05af0dd2f..a5483368690a 100644
@@ -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,6 +198,15 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)
 ????? wr32(IGC_CTRL, ctrl);
 ????? wrfl();
+??? do {
+??????? phpm = rd32(IGC_I225_PHPM);
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_phy.c s32 igc_phy_hw_reset(struct igc_hw *hw) · line 207

Quoted 6 lines
drivers/net/ethernet/intel/igc/igc_phy.c +6 -0
+??????? timeout--;
+??????? udelay(1);
+??? } while (!(phpm & IGC_PHY_RST_COMP) && timeout);
+
+??? if (!timeout)
+??????? hw_dbg("Timeoui is expired after a phy reset\n");

nitpick: Timeoui -> Timeout

Quoted 1 line

thanks - I will send v3 and fix the typo

Unfortunately, RST_COMPL signal in a PHY power management registers still not work as properly. Please, disregard this patch. The RST_COMPL indication should be fixed. I will release another patch so.

Quoted 1 line

________________________________________

_______

Quoted 3 lines

Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

#4 lore raw

PATCH v2 1/1 igc: Add PHY power management control

In reply to Neftin
Quoted 63 lines · Sasha
Quoted 53 lines · Vinicius Costa Gomes
Quoted 50 lines · Sasha Neftin

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

---

? drivers/net/ethernet/intel/igc/igc_defines.h |? 1 +
? drivers/net/ethernet/intel/igc/igc_phy.c???? | 12 ++++++++++++
? drivers/net/ethernet/intel/igc/igc_regs.h??? |? 1 +

? 3 files changed, 14 insertions(+)

drivers/net/ethernet/intel/igc/igc_defines.h +0 -0
index 2121fc34e300..71a4b0281c03 100644
@@ -460,6 +460,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 +5 -0
index f4b05af0dd2f..a5483368690a 100644
@@ -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,6 +198,15 @@ s32 igc_phy_hw_reset(struct igc_hw *hw)
 ????? wr32(IGC_CTRL, ctrl);
 ????? wrfl();
+??? do {
+??????? phpm = rd32(IGC_I225_PHPM);
Quoted 9 lines

drivers/net/ethernet/intel/igc/igc_phy.c s32 igc_phy_hw_reset(struct igc_hw *hw) · line 207

Quoted 6 lines
drivers/net/ethernet/intel/igc/igc_phy.c +6 -0
+??????? timeout--;
+??????? udelay(1);
+??? } while (!(phpm & IGC_PHY_RST_COMP) && timeout);
+
+??? if (!timeout)
+??????? hw_dbg("Timeoui is expired after a phy reset\n");

nitpick: Timeoui -> Timeout

Quoted 1 line

thanks - I will send v3 and fix the typo

RST_COMP still not works as properly. Let's disregard this patch.

Quoted 4 lines

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan