Use C45 Helpers when possible
Subsystems (3)
cover Use C45 Helpers when possible
For -net. Please review!
Jose Abreu (2):
net: phy: Use C45 Helpers in phy_read_status()
net: phy: Use C45 Helpers in PHY_FORCING state
drivers/net/phy/phy.c | 2 +- include/linux/phy.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH 2/2 net: phy: Use C45 Helpers in PHY_FORCING state
When using a C45 PHY that is in PHY_FORCING state we are currently not taking into account that this kind of PHY has different update_link functions.
Use the C45 Helpers instead or the driver built-in read_status() helper, if possible.
--- drivers/net/phy/phy.c | 2 +- include/linux/phy.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/net/phy/phy.c +1 -1
@@ -940,7 +940,7 @@ void phy_state_machine(struct work_struct *work) err =phy_check_link_status (phydev);break ;case PHY_FORCING : - err =genphy_update_link (phydev); + err =phy_update_link (phydev);if (err)break ;
include/linux/phy.h +13 -0
@@ -1036,6 +1036,19 @@ static inline int phy_read_status(struct phy_device *phydev)return genphy_read_status (phydev); } +static inline int phy_update_link (struct phy_device *phydev) +{ +if (!phydev->drv) +return -EIO ; + +if (phydev->drv->read_status) +return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev); +else +return genphy_update_link (phydev); +} +void phy_driver_unregister (struct phy_driver *drv);void phy_drivers_unregister (struct phy_driver *drv,int n);int phy_driver_register (struct phy_driver *new_driver,struct module *owner);
Signature · 1 line
2.7.4
PATCH 1/2 net: phy: Use C45 Helpers in phy_read_status()
In reply to Jose AbreuCurrently phy_read_status() considers that either the PHY driver has the read_status() callback or uses the generic callback.
For C45 PHYs we need to use the gen10g_read_status() callback.
--- include/linux/phy.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/phy.h +2 -0
@@ -1030,6 +1030,8 @@ static inline int phy_read_status(struct phy_device *phydev)if (phydev->drv->read_status)return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev);else return genphy_read_status (phydev); }
Signature · 1 line
2.7.4
Andrew Lunn
maintainerQuoted 1 line · Jose Abreu
For -net. Please review!
Hi Jose
Patches for net should have fixes: tags, making it clear what they fix, and how far back the patches should be ported.
Thanks
Andrew
Andrew Lunn
maintainerRe: [PATCH net 2/2] net: phy: Use C45 Helpers in PHY_FORCING state
In reply to Jose Abreuinclude/linux/phy.h static inline int phy_read_status(struct phy_device *phydev) · line 1050
Quoted 12 lines · Jose Abreu
include/linux/phy.h +12
-0+static inline int phy_update_link (struct phy_device *phydev) +{ +if (!phydev->drv) +return -EIO ; + +if (phydev->drv->read_status) +return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev); +else +return genphy_update_link (phydev); +}
Hi Jose
The asymmetry here could be an issue. We might fall into the trap that a c45 PHY has the full state in phydev updated, were as a c22 only has the link updated. Somebody testing on C45 might miss a bug for a C22 device.
Maybe this should be called phy_read_state(), and calls genphy_read_status() not genphy_update_link().
Andrew
Re: [PATCH net 1/2] net: phy: Use C45 Helpers in phy_read_status()
In reply to Jose AbreuQuoted 4 lines · Jose Abreu
Currently
phy_read_status()considers that either the PHY driver has theread_status()callback or uses the generic callback.For C45 PHYs we need to use the
gen10g_read_status()callback.
Right, so we could expect your C45 PHY driver to assign the read_status callback to gen10g_read_status() if it is appropriate. So far most of the 10g PHY drivers (cortina, marvell10g, aquantia) have to define their own read_status() callback to be feature complete. Unlike C22 PHYs that can really be driven with a simple generic PHY driver model for standard features, C45 PHYs seem to be quirky enough this does not work anymore.
Quoted 24 lines
Signed-off-by Jose Abreu <[email protected]>Cc Andrew Lunn <[email protected]>Cc Florian Fainelli <[email protected]>Cc "David S. Miller" <[email protected]>Cc Joao Pinto <[email protected]>--- include/linux/phy.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/phy.h +2
-0@@ -1030,6 +1030,8 @@ static inline int phy_read_status(struct phy_device *phydev)if (phydev->drv->read_status)return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev);else return genphy_read_status (phydev); }
Signature · 1 line
Florian
Andrew Lunn
maintainerRe: [PATCH net 1/2] net: phy: Use C45 Helpers in phy_read_status()
Quoted 6 lines · Florian Fainelli
Quoted 3 lines · Jose Abreu
Currently
phy_read_status()considers that either the PHY driver has theread_status()callback or uses the generic callback.
Quoted 8 lines
Quoted 1 line
For C45 PHYs we need to use the
gen10g_read_status()callback.Right, so we could expect your C45 PHY driver to assign the
read_statuscallback togen10g_read_status()if it is appropriate. So far most of the 10g PHY drivers (cortina, marvell10g, aquantia) have to define their ownread_status()callback to be feature complete. Unlike C22 PHYs that can really be driven with a simple generic PHY driver model for standard features, C45 PHYs seem to be quirky enough this does not work anymore.
Hi Jose
Does your PHY support 1000Base-T? If so you need read_status() because the registers for that link mode don't appear to be standardized.
Andrew
Heiner Kallweit
maintainerRe: [PATCH net 1/2] net: phy: Use C45 Helpers in phy_read_status()
Quoted 9 lines · Andrew Lunn
Quoted 8 lines · Florian Fainelli
Quoted 4 lines · Jose Abreu
Currently
phy_read_status()considers that either the PHY driver has theread_status()callback or uses the generic callback.For C45 PHYs we need to use the
gen10g_read_status()callback.
The gen10g_ functions are deprecated and shouldn't be used in new code. Consider the (partially brand-new) genphy_c45_ functions instead. This should be ok because I think the two changes are material for net-next.
The gen10g functions belong to the old gen10g driver which knows about 10G only. I think sooner or later we'll replace it with a genc45 driver or similar.
Quoted 7 lines
Quoted 6 lines
Right, so we could expect your C45 PHY driver to assign the
read_statuscallback togen10g_read_status()if it is appropriate. So far most of the 10g PHY drivers (cortina, marvell10g, aquantia) have to define their ownread_status()callback to be feature complete. Unlike C22 PHYs that can really be driven with a simple generic PHY driver model for standard features, C45 PHYs seem to be quirky enough this does not work anymore.
Quoted 7 lines
Hi Jose
Does your PHY support 1000Base-T? If so you need
read_status()because the registers for that link mode don't appear to be standardized.Andrew
Heiner
Re: [PATCH net 2/2] net: phy: Use C45 Helpers in PHY_FORCING state
In reply to Andrew LunnHi Andrew,
Quoted 16 lines · Andrew Lunn
include/linux/phy.h static inline int phy_read_status(struct phy_device *phydev) · line 1050
Quoted 12 lines · Jose Abreu
include/linux/phy.h +12
-0+static inline int phy_update_link (struct phy_device *phydev) +{ +if (!phydev->drv) +return -EIO ; + +if (phydev->drv->read_status) +return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev); +else +return genphy_update_link (phydev); +}Hi Jose
Quoted 4 lines
The asymmetry here could be an issue. We might fall into the trap that a c45 PHY has the full state in phydev updated, were as a c22 only has the link updated. Somebody testing on C45 might miss a bug for a C22 device.
Notice that this phy_update_link() is called from PHY_FORCING state which in my case happens when autoneg is not enabled / is not supported.
I think it makes sense, in this case, to only update link status, no ?
Thanks,
Jose Miguel Abreu
Quoted 6 lines
Maybe this should be called
phy_read_state(), and callsgenphy_read_status()notgenphy_update_link().Andrew
Andrew Lunn
maintainerRe: [PATCH net 2/2] net: phy: Use C45 Helpers in PHY_FORCING state
Quoted 24 lines · Jose Abreu
Hi Andrew,
Quoted 16 lines · Andrew Lunn
include/linux/phy.h static inline int phy_read_status(struct phy_device *phydev) · line 1050
Quoted 12 lines · Jose Abreu
include/linux/phy.h +12
-0+static inline int phy_update_link (struct phy_device *phydev) +{ +if (!phydev->drv) +return -EIO ; + +if (phydev->drv->read_status) +return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev); +else +return genphy_update_link (phydev); +}Hi Jose
Quoted 4 lines
The asymmetry here could be an issue. We might fall into the trap that a c45 PHY has the full state in phydev updated, were as a c22 only has the link updated. Somebody testing on C45 might miss a bug for a C22 device.
Quoted 6 lines
Notice that this
phy_update_link()is called fromPHY_FORCINGstate which in my case happens when autoneg is not enabled / is not supported.I think it makes sense, in this case, to only update link status, no ?
Hi Jose
It is actually quite difficult to determine when the link is up. I personally would not trust gen10g_read_status() to get this right, and would always implement the read_status callback.
Which PHY driver are you using, which does not support read_status(). All the mainline PHY drivers do seem to have read_status implemented.
Andrew
Heiner Kallweit
maintainerRe: [PATCH net 2/2] net: phy: Use C45 Helpers in PHY_FORCING state
Quoted 29 lines · Andrew Lunn
Quoted 28 lines · Jose Abreu
Hi Andrew,
Quoted 16 lines · Andrew Lunn
include/linux/phy.h static inline int phy_read_status(struct phy_device *phydev) · line 1050
Quoted 12 lines · Jose Abreu
include/linux/phy.h +12
-0+static inline int phy_update_link (struct phy_device *phydev) +{ +if (!phydev->drv) +return -EIO ; + +if (phydev->drv->read_status) +return phydev->drv->read_status (phydev); +else if (phydev->is_c45) +return gen10g_read_status (phydev); +else +return genphy_update_link (phydev); +}Hi Jose
Quoted 4 lines
The asymmetry here could be an issue. We might fall into the trap that a c45 PHY has the full state in phydev updated, were as a c22 only has the link updated. Somebody testing on C45 might miss a bug for a C22 device.
Notice that this
phy_update_link()is called fromPHY_FORCINGstate which in my case happens when autoneg is not enabled / is not supported.
Quoted 9 lines
Quoted 2 lines
I think it makes sense, in this case, to only update link status, no ?
Hi Jose
It is actually quite difficult to determine when the link is up. I personally would not trust
gen10g_read_status()to get this right, and would always implement theread_statuscallback.
Not to forget that we just stopped exporting gen10g_read_status(). genphy_c45_read_link() seems to be the right function to be used in phy_update_link().
Quoted 6 lines
Which PHY driver are you using, which does not support
read_status(). All the mainline PHY drivers do seem to haveread_statusimplemented.Andrew
Heiner