net: phy: fix reading fixed phy status
Subsystems (3)
Heiner Kallweit
maintainerPATCH 1/1 net: phy: fix reading fixed phy status
With the switch to phy_resolve_aneg_linkmode() we don't read from the chip any longer what is advertised but use phydev->advertising directly. For a fixed phy however this bitmap is empty so far, what results in no common mode being found. This breaks DSA. Fix this by advertising everything that is supported. For a normal phy this done by phy_probe().
--- drivers/net/phy/fixed_phy.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/phy/fixed_phy.c +3 -0
@@ -22,6 +22,7 @@#include <linux/seqlock.h> #include <linux/idr.h> #include <linux/netdevice.h> +#include <linux/linkmode.h> #include "swphy.h"
@@ -300,6 +301,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, phy->supported); } +linkmode_copy (phy->advertising, phy->supported); + ret =phy_device_register (phy);if (ret) {phy_device_free (phy);
Signature · 1 line
2.20.1
Quoted 8 lines · Heiner Kallweit
With the switch to
phy_resolve_aneg_linkmode()we don't read from the chip any longer what is advertised but usephydev->advertisingdirectly. For a fixed phy however this bitmap is empty so far, what results in no common mode being found. This breaks DSA. Fix this by advertising everything that is supported. For a normal phy this done byphy_probe().Fixes 5502b218e001 ("net: phy: use phy_resolve_aneg_linkmode in genphy_read_status")Signed-off-by Heiner Kallweit <[email protected]>
But i tested on net-next, not net.
Andrew
Quoted 28 lines
--- drivers/net/phy/fixed_phy.c | 3 +++ 1 file changed, 3 insertions(+)drivers/net/phy/fixed_phy.c +3
-0@@ -22,6 +22,7 @@#include <linux/seqlock.h> #include <linux/idr.h> #include <linux/netdevice.h> +#include <linux/linkmode.h> #include "swphy.h" @@ -300,6 +301,8 @@ static struct phy_device *__fixed_phy_register(unsigned int irq, phy->supported); } +linkmode_copy (phy->advertising, phy->supported); + ret =phy_device_register (phy);if (ret) {phy_device_free (phy);Signature · 1 line
2.20.1
Heiner Kallweit
maintainerQuoted 7 lines · Andrew Lunn
Quoted 6 lines · Heiner Kallweit
With the switch to
phy_resolve_aneg_linkmode()we don't read from the chip any longer what is advertised but usephydev->advertisingdirectly. For a fixed phy however this bitmap is empty so far, what results in no common mode being found. This breaks DSA. Fix this by advertising everything that is supported. For a normal phy this done byphy_probe().
Quoted 7 lines
Quoted 2 lines
Fixes 5502b218e001 ("net: phy: use phy_resolve_aneg_linkmode in genphy_read_status")Signed-off-by Heiner Kallweit <[email protected]>Tested-by Andrew Lunn <[email protected]>But i tested on net-next, not net.
You're right, it should be net-next. I just had the wrong automatism fix = net in my mind.
Quoted 3 lines
Andrew
Heiner
From: Heiner Kallweit <[email protected]>
Date: Sun, 24 Feb 2019 18:01:18 +0100
Quoted 8 lines
With the switch to
phy_resolve_aneg_linkmode()we don't read from the chip any longer what is advertised but usephydev->advertisingdirectly. For a fixed phy however this bitmap is empty so far, what results in no common mode being found. This breaks DSA. Fix this by advertising everything that is supported. For a normal phy this done byphy_probe().Fixes 5502b218e001 ("net: phy: use phy_resolve_aneg_linkmode in genphy_read_status")Signed-off-by Heiner Kallweit <[email protected]>
Applied to net-next.
Let me know if I got this wrong.