Skip to contentSkip to conversation

drivers/net/ethernet/e1000e: check return value of e1e_rphy()

PATCH In review Li Zhong 3 participants 3 messages Aug 30, 2022 – Sep 4, 2022

Subsystems (3)
lore
Share & tools
lore

Li Zhong

author
#0 lore raw

PATCH v3 1/1 drivers/net/ethernet/e1000e: check return value of e1e_rphy()

e1e_rphy() could return error value when reading PHY register, which needs to be checked.

---
 drivers/net/ethernet/intel/e1000e/phy.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/e1000e/phy.c +17 -3
index fd07c3679bb1..060b263348ce 100644
@@ -2697,9 +2697,14 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
 void e1000_power_up_phy_copper(struct e1000_hw *hw)
 {
 	u16 mii_reg = 0;
+	int ret;
 
 	/* The PHY will retain its settings across a power down/up cycle */
-	e1e_rphy(hw, MII_BMCR, &mii_reg);
+	ret = e1e_rphy(hw, MII_BMCR, &mii_reg);
+	if (ret) {
+		e_dbg("Error reading PHY register\n");
+		return;
+	}
 	mii_reg &= ~BMCR_PDOWN;
 	e1e_wphy(hw, MII_BMCR, mii_reg);
 }
@@ -2715,9 +2720,14 @@ void e1000_power_up_phy_copper(struct e1000_hw *hw)
 void e1000_power_down_phy_copper(struct e1000_hw *hw)
 {
 	u16 mii_reg = 0;
+	int ret;
 
 	/* The PHY will retain its settings across a power down/up cycle */
-	e1e_rphy(hw, MII_BMCR, &mii_reg);
+	ret = e1e_rphy(hw, MII_BMCR, &mii_reg);
+	if (ret) {
+		e_dbg("Error reading PHY register\n");
+		return;
+	}
 	mii_reg |= BMCR_PDOWN;
 	e1e_wphy(hw, MII_BMCR, mii_reg);
 	usleep_range(1000, 2000);
@@ -3037,7 +3047,11 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
 		return 0;
 
 	/* Do not apply workaround if in PHY loopback bit 14 set */
-	e1e_rphy(hw, MII_BMCR, &data);
+	ret_val = e1e_rphy(hw, MII_BMCR, &data);
+	if (ret_val) {
+		e_dbg("Error reading PHY register\n");
+		return ret_val;
+	}
 	if (data & BMCR_LOOPBACK)
 		return 0;
 
Signature · 1 line
2.25.1
Acked-by on v3 1/1
#1 lore raw
Quoted 47 lines · Li Zhong

e1e_rphy() could return error value when reading PHY register, which needs to be checked.

---
  drivers/net/ethernet/intel/e1000e/phy.c | 20 +++++++++++++++++---
  1 file changed, 17 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/e1000e/phy.c +12 -2
index fd07c3679bb1..060b263348ce 100644
@@ -2697,9 +2697,14 @@ static s32 e1000_access_phy_wakeup_reg_bm(struct e1000_hw *hw, u32 offset,
  void e1000_power_up_phy_copper(struct e1000_hw *hw)
  {
  	u16 mii_reg = 0;
+	int ret;
 
  	/* The PHY will retain its settings across a power down/up cycle */
-	e1e_rphy(hw, MII_BMCR, &mii_reg);
+	ret = e1e_rphy(hw, MII_BMCR, &mii_reg);
+	if (ret) {
+		e_dbg("Error reading PHY register\n");
+		return;
+	}
  	mii_reg &= ~BMCR_PDOWN;
  	e1e_wphy(hw, MII_BMCR, mii_reg);
  }
@@ -2715,9 +2720,14 @@ void e1000_power_up_phy_copper(struct e1000_hw *hw)
  void e1000_power_down_phy_copper(struct e1000_hw *hw)
  {
  	u16 mii_reg = 0;
+	int ret;
 
  	/* The PHY will retain its settings across a power down/up cycle */
-	e1e_rphy(hw, MII_BMCR, &mii_reg);
+	ret = e1e_rphy(hw, MII_BMCR, &mii_reg);
+	if (ret) {
+		e_dbg("Error reading PHY register\n");
+		return;
+	}
  	mii_reg |= BMCR_PDOWN;
  	e1e_wphy(hw, MII_BMCR, mii_reg);
  	usleep_range(1000, 2000);
@@ -3037,7 +3047,11 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
  		return 0;
 

drivers/net/ethernet/intel/e1000e/phy.c s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw) · line 3057

Quoted 10 lines
drivers/net/ethernet/intel/e1000e/phy.c +5 -1
  	/* Do not apply workaround if in PHY loopback bit 14 set */
-	e1e_rphy(hw, MII_BMCR, &data);
+	ret_val = e1e_rphy(hw, MII_BMCR, &data);
+	if (ret_val) {
+		e_dbg("Error reading PHY register\n");
+		return ret_val;
+	}
  	if (data & BMCR_LOOPBACK)
  		return 0;