[PATCH net-next] net: phy: realtek: add error handling to rtl8211f_get_wol

[PATCH net-next] net: phy: realtek: add error handling to rtl8211f_get_wol

[Daniel Braunwarth via B4 Relay]

From: Daniel Braunwarth <daniel.braunwarth@kuka.com>

We should check if the WOL settings was successfully read from the PHY.

In case this fails we cannot just use the error code and proceed.

Signed-off-by: Daniel Braunwarth <daniel.braunwarth@kuka.com>
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Closes: https://lore.kernel.org/baaa083b-9a69-460f-ab35-2a7cb3246ffd@nvidia.com
---
 drivers/net/phy/realtek/realtek_main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/realtek/realtek_main.c b/drivers/net/phy/realtek/realtek_main.c
index c3dcb62574303374666b46a454cd4e10de455d24..dd0d675149ad7f9730f04ba1aea82e02b15dfb2c 100644
--- a/drivers/net/phy/realtek/realtek_main.c
+++ b/drivers/net/phy/realtek/realtek_main.c
@@ -436,9 +436,15 @@ static irqreturn_t rtl8211f_handle_interrupt(struct phy_device *phydev)
 
 static void rtl8211f_get_wol(struct phy_device *dev, struct ethtool_wolinfo *wol)
 {
+	int wol_events;
+
 	wol->supported = WAKE_MAGIC;
-	if (phy_read_paged(dev, RTL8211F_WOL_SETTINGS_PAGE, RTL8211F_WOL_SETTINGS_EVENTS)
-	    & RTL8211F_WOL_EVENT_MAGIC)
+
+	wol_events = phy_read_paged(dev, RTL8211F_WOL_SETTINGS_PAGE, RTL8211F_WOL_SETTINGS_EVENTS);
+	if (wol_events < 0)
+		return;
+
+	if (wol_events & RTL8211F_WOL_EVENT_MAGIC)
 		wol->wolopts = WAKE_MAGIC;
 }
 

---
base-commit: f817b6dd2b62d921a6cdc0a3ac599cd1851f343c
change-id: 20250624-realtek_fixes-85f292cfc1a4

Best regards,
-- 
Daniel Braunwarth <daniel.braunwarth@kuka.com>

Re: [PATCH net-next] net: phy: realtek: add error handling to rtl8211f_get_wol

[Andrew Lunn]

On Tue, Jun 24, 2025 at 04:17:33PM +0200, Daniel Braunwarth via B4 Relay wrote:
> From: Daniel Braunwarth <daniel.braunwarth@kuka.com>
> 
> We should check if the WOL settings was successfully read from the PHY.
> 
> In case this fails we cannot just use the error code and proceed.
> 
> Signed-off-by: Daniel Braunwarth <daniel.braunwarth@kuka.com>
> Reported-by: Jon Hunter <jonathanh@nvidia.com>
> Closes: https://lore.kernel.org/baaa083b-9a69-460f-ab35-2a7cb3246ffd@nvidia.com

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH net-next] net: phy: realtek: add error handling to rtl8211f_get_wol

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Tue, 24 Jun 2025 16:17:33 +0200 you wrote:
> From: Daniel Braunwarth <daniel.braunwarth@kuka.com>
> 
> We should check if the WOL settings was successfully read from the PHY.
> 
> In case this fails we cannot just use the error code and proceed.
> 
> Signed-off-by: Daniel Braunwarth <daniel.braunwarth@kuka.com>
> Reported-by: Jon Hunter <jonathanh@nvidia.com>
> Closes: https://lore.kernel.org/baaa083b-9a69-460f-ab35-2a7cb3246ffd@nvidia.com
> 
> [...]

Here is the summary with links:
  - [net-next] net: phy: realtek: add error handling to rtl8211f_get_wol
    https://git.kernel.org/netdev/net-next/c/a9b24b3583ae

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html