* [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi()
@ 2024-10-11 21:33 Daniel Golle
2024-10-12 17:19 ` Andrew Lunn
2024-10-13 13:03 ` Hans-Frieder Vogt
0 siblings, 2 replies; 3+ messages in thread
From: Daniel Golle @ 2024-10-11 21:33 UTC (permalink / raw)
To: Andrew Lunn, Heiner Kallweit, Russell King, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Christian Marangi,
Daniel Golle, Bartosz Golaszewski, Abhishek Chauhan,
Robert Marko, netdev, linux-kernel
of_property_read_u32() returns -EINVAL in case the property cannot be
found rather than -ENOENT. Fix the check to not abort probing in case
of the property being missing.
Fixes: a2e1ba275eae ("net: phy: aquantia: allow forcing order of MDI pairs")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Closes: https://lore.kernel.org/all/114b4c03-5d16-42ed-945d-cf78eabea12b@nvidia.com/
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
drivers/net/phy/aquantia/aquantia_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
index 4fe757cd7dc7..49fd21d1b3c9 100644
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -513,7 +513,7 @@ static int aqr107_config_mdi(struct phy_device *phydev)
ret = of_property_read_u32(np, "marvell,mdi-cfg-order", &mdi_conf);
/* Do nothing in case property "marvell,mdi-cfg-order" is not present */
- if (ret == -ENOENT)
+ if (ret == -EINVAL)
return 0;
if (ret)
--
2.47.0
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi()
2024-10-11 21:33 [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi() Daniel Golle
@ 2024-10-12 17:19 ` Andrew Lunn
2024-10-13 13:03 ` Hans-Frieder Vogt
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Lunn @ 2024-10-12 17:19 UTC (permalink / raw)
To: Daniel Golle
Cc: Heiner Kallweit, Russell King, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Christian Marangi,
Bartosz Golaszewski, Abhishek Chauhan, Robert Marko, netdev,
linux-kernel
On Fri, Oct 11, 2024 at 10:33:52PM +0100, Daniel Golle wrote:
> of_property_read_u32() returns -EINVAL in case the property cannot be
> found rather than -ENOENT. Fix the check to not abort probing in case
> of the property being missing.
>
> Fixes: a2e1ba275eae ("net: phy: aquantia: allow forcing order of MDI pairs")
> Reported-by: Jon Hunter <jonathanh@nvidia.com>
> Closes: https://lore.kernel.org/all/114b4c03-5d16-42ed-945d-cf78eabea12b@nvidia.com/
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi()
2024-10-11 21:33 [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi() Daniel Golle
2024-10-12 17:19 ` Andrew Lunn
@ 2024-10-13 13:03 ` Hans-Frieder Vogt
1 sibling, 0 replies; 3+ messages in thread
From: Hans-Frieder Vogt @ 2024-10-13 13:03 UTC (permalink / raw)
To: daniel
Cc: andrew, ansuelsmth, bartosz.golaszewski, davem, edumazet,
hkallweit1, kuba, linux-kernel, linux, netdev, pabeni,
quic_abchauha, robimarko
On Fri, 11 Oct 2024 22:33:52 +0100, Daniel Golle wrote:
> of_property_read_u32() returns -EINVAL in case the property cannot be
> found rather than -ENOENT. Fix the check to not abort probing in case
> of the property being missing.
there is another failure case, which is not properly covered:
if the system is non-device-tree, the function of_property_read_u32 returns -ENOSYS.
While you are correcting the return value, you may also correct this case.
>
> Fixes: a2e1ba275eae ("net: phy: aquantia: allow forcing order of MDI pairs")
> Reported-by: Jon Hunter <jonathanh@nvidia.com>
> Closes: https://lore.kernel.org/all/114b4c03-5d16-42ed-945d-cf78eabea12b@nvidia.com/
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> drivers/net/phy/aquantia/aquantia_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
> index 4fe757cd7dc7..49fd21d1b3c9 100644
> --- a/drivers/net/phy/aquantia/aquantia_main.c
> +++ b/drivers/net/phy/aquantia/aquantia_main.c
> @@ -513,7 +513,7 @@ static int aqr107_config_mdi(struct phy_device *phydev)
> ret = of_property_read_u32(np, "marvell,mdi-cfg-order", &mdi_conf);
>
> /* Do nothing in case property "marvell,mdi-cfg-order" is not present */
> - if (ret == -ENOENT)
> + if (ret == -EINVAL)
the non-device-tree case could be simply covered by this:
if (ret == -EINVAL || ret == -ENOSYS)
> return 0;
>
> if (ret)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-13 13:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-10-11 21:33 [PATCH net-next] net: phy: aquantia: fix return value check in aqr107_config_mdi() Daniel Golle
2024-10-12 17:19 ` Andrew Lunn
2024-10-13 13:03 ` Hans-Frieder Vogt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®