* [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy()
@ 2022-08-30 7:15 Li Zhong
2022-09-04 5:42 ` [Intel-wired-lan] " Neftin, Sasha
2022-09-04 8:19 ` naamax.meir
0 siblings, 2 replies; 3+ messages in thread
From: Li Zhong @ 2022-08-30 7:15 UTC (permalink / raw)
To: netdev, linux-kernel, intel-wired-lan
Cc: jesse.brandeburg, anthony.l.nguyen, davem, edumazet, kuba, pabeni,
Li Zhong
e1e_rphy() could return error value when reading PHY register, which
needs to be checked.
Signed-off-by: Li Zhong <floridsleeves@gmail.com>
---
drivers/net/ethernet/intel/e1000e/phy.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index fd07c3679bb1..060b263348ce 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Intel-wired-lan] [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy()
2022-08-30 7:15 [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy() Li Zhong
@ 2022-09-04 5:42 ` Neftin, Sasha
2022-09-04 8:19 ` naamax.meir
1 sibling, 0 replies; 3+ messages in thread
From: Neftin, Sasha @ 2022-09-04 5:42 UTC (permalink / raw)
To: Li Zhong, netdev, linux-kernel, intel-wired-lan
Cc: edumazet, kuba, pabeni, davem, Neftin, Sasha
On 8/30/2022 10:15, Li Zhong wrote:
> e1e_rphy() could return error value when reading PHY register, which
> needs to be checked.
>
> Signed-off-by: Li Zhong <floridsleeves@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000e/phy.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
> index fd07c3679bb1..060b263348ce 100644
> --- a/drivers/net/ethernet/intel/e1000e/phy.c
> +++ b/drivers/net/ethernet/intel/e1000e/phy.c
> @@ -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;
>
Acked-by: Sasha Neftin <sasha.neftin@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-wired-lan] [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy()
2022-08-30 7:15 [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy() Li Zhong
2022-09-04 5:42 ` [Intel-wired-lan] " Neftin, Sasha
@ 2022-09-04 8:19 ` naamax.meir
1 sibling, 0 replies; 3+ messages in thread
From: naamax.meir @ 2022-09-04 8:19 UTC (permalink / raw)
To: Li Zhong, netdev, linux-kernel, intel-wired-lan
Cc: edumazet, kuba, pabeni, davem
On 8/30/2022 10:15, Li Zhong wrote:
> e1e_rphy() could return error value when reading PHY register, which
> needs to be checked.
>
> Signed-off-by: Li Zhong <floridsleeves@gmail.com>
> ---
> drivers/net/ethernet/intel/e1000e/phy.c | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-04 8:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-30 7:15 [PATCH v3] drivers/net/ethernet/e1000e: check return value of e1e_rphy() Li Zhong
2022-09-04 5:42 ` [Intel-wired-lan] " Neftin, Sasha
2022-09-04 8:19 ` naamax.meir
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).