net: phy: marvell10g: report if the PHY fails to boot firmware
Subsystems (4)
PATCH 1/1 net: phy: marvell10g: report if the PHY fails to boot firmware
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
---
I think this patch needs testing with the Marvell 88x2110 PHY before this can be merged into mainline, but I think it should go into -rc and be back-ported to stable trees to avoid user frustration. I spent some time last night debugging one such instance, and the user afterwards indicated that they'd had the problem for a long time, and had thought of throwing the hardware out the window! Clearly not a good user experience.
drivers/net/phy/marvell10g.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/phy/marvell10g.c +13 -0
@@ -31,6 +31,9 @@#define MV_PHY_ALASKA_NBT_QUIRK_REV (MARVELL_PHY_ID_88X3310 | 0xa)enum { +MV_PMA_BOOT =0xc050 , +MV_PMA_BOOT_FATAL =BIT (0 ), +MV_PCS_BASE_T =0x0000 ,MV_PCS_BASE_R =0x1000 ,MV_PCS_1000BASEX =0x2000 ,
@@ -211,6 +214,16 @@ static int mv3310_probe(struct phy_device *phydev) (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)return -ENODEV ; + ret =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MV_PMA_BOOT ); +if (ret <0 ) +return ret; + +if (ret &MV_PMA_BOOT_FATAL ) { +dev_warn (&phydev->mdio.dev, +"PHY failed to boot firmware, status=%04x\n" , ret); +return -ENODEV ; + } + priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ;
Signature · 1 line
2.7.4
Hello Russell,
Quoted 9 lines · On Tue, 28 May 2019 10:34:42 +0100 Russell King <[email protected]>…
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
Signed-off-by Russell King <[email protected]>---
I think this patch needs testing with the Marvell 88x2110 PHY before this can be merged into mainline, but I think it should go into -rc and be back-ported to stable trees to avoid user frustration
I've tested this on a 88x2110 and a 88e2010, who both have the same register at the same location, at are potentially subject to the same issue.
Thanks,
Maxime
Quoted 5 lines · Russell King
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
Signed-off-by Russell King <[email protected]>
Andrew
Russell King - ARM Linux admin
maintainerQuoted 33 lines · Russell King
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
Signed-off-by Russell King <[email protected]>---
I think this patch needs testing with the Marvell 88x2110 PHY before this can be merged into mainline, but I think it should go into -rc and be back-ported to stable trees to avoid user frustration. I spent some time last night debugging one such instance, and the user afterwards indicated that they'd had the problem for a long time, and had thought of throwing the hardware out the window! Clearly not a good user experience.drivers/net/phy/marvell10g.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)drivers/net/phy/marvell10g.c +3
-0@@ -31,6 +31,9 @@#define MV_PHY_ALASKA_NBT_QUIRK_REV (MARVELL_PHY_ID_88X3310 | 0xa)enum { +MV_PMA_BOOT =0xc050 , +MV_PMA_BOOT_FATAL =BIT (0 ), +MV_PCS_BASE_T =0x0000 ,MV_PCS_BASE_R =0x1000 ,MV_PCS_1000BASEX =0x2000 ,@@ -211,6 +214,16 @@ static int mv3310_probe(struct phy_device *phydev) (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)
drivers/net/phy/marvell10g.c static int mv3310_probe(struct phy_device *phydev) · line 224
Quoted 10 lines
drivers/net/phy/marvell10g.c +8
-0return -ENODEV ; + ret =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MV_PMA_BOOT ); +if (ret <0 ) +return ret; + +if (ret &MV_PMA_BOOT_FATAL ) { +dev_warn (&phydev->mdio.dev, +"PHY failed to boot firmware, status=%04x\n" , ret); +return -ENODEV ;
One question: are we happy with failing the probe like this, or would it be better to allow the probe to suceed?
As has been pointed out in the C45 MII access patch, we need the PHY to bind to the network driver for the MII bus to be accessible to userspace, so if we're going to have userspace tools to upload the firmware, rather than using u-boot, we need the PHY to be present and bound to the network interface.
Quoted 9 lines
drivers/net/phy/marvell10g.c +2
-0+ } + priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL );if (!priv)return -ENOMEM ;Signature · 1 line
2.7.4
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Andrew Lunn
maintainerQuoted 8 lines
One question: are we happy with failing the probe like this, or would it be better to allow the probe to suceed?
As has been pointed out in the C45 MII access patch, we need the PHY to bind to the network driver for the MII bus to be accessible to userspace, so if we're going to have userspace tools to upload the firmware, rather than using u-boot, we need the PHY to be present and bound to the network interface.
Hi Russell
It is an interesting question. Failing the probe is the simple solution. If we don't fail the probe, we then need to allow the attach, but fail all normal operations, with a noisy kernel log. That probably means adding a new state to the state machine, PHY_BROKEN. Enter that state if phy_start_aneg() returns an error?
Andrew
Russell King - ARM Linux admin
maintainerQuoted 9 lines · Andrew Lunn
Quoted 8 lines
One question: are we happy with failing the probe like this, or would it be better to allow the probe to suceed?
As has been pointed out in the C45 MII access patch, we need the PHY to bind to the network driver for the MII bus to be accessible to userspace, so if we're going to have userspace tools to upload the firmware, rather than using u-boot, we need the PHY to be present and bound to the network interface.
Quoted 7 lines
Hi Russell
It is an interesting question. Failing the probe is the simple solution. If we don't fail the probe, we then need to allow the attach, but fail all normal operations, with a noisy kernel log. That probably means adding a new state to the state machine,
PHY_BROKEN. Enter that state ifphy_start_aneg()returns an error?
Hi Andrew,
I don't think we need a new state - I think we can trap it in the link_change_notify() method, and force phydev->state to PHY_HALTED if it's in phy_is_started() mode.
Maybe something like:
if (phy_is_started(phydev) && priv->firmware_failed) {
dev_warn(&phydev->mdio.dev,
"PHY firmware failure: link forced down");
phydev->state = PHY_HALTED;
}Or maybe we just need to do that if phydev->state == PHY_UP or PHY_RESUMING (the two states entered from phy_start())?
Russell.
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Russell King - ARM Linux admin
maintainerQuoted 26 lines · Russell King - ARM Linux admin
Quoted 9 lines · Andrew Lunn
Quoted 8 lines
One question: are we happy with failing the probe like this, or would it be better to allow the probe to suceed?
As has been pointed out in the C45 MII access patch, we need the PHY to bind to the network driver for the MII bus to be accessible to userspace, so if we're going to have userspace tools to upload the firmware, rather than using u-boot, we need the PHY to be present and bound to the network interface.
Quoted 7 lines
Hi Russell
It is an interesting question. Failing the probe is the simple solution. If we don't fail the probe, we then need to allow the attach, but fail all normal operations, with a noisy kernel log. That probably means adding a new state to the state machine,
PHY_BROKEN. Enter that state ifphy_start_aneg()returns an error?Hi Andrew,
I don't think we need a new state - I think we can trap it in the
link_change_notify()method, and forcephydev->statetoPHY_HALTEDif it's inphy_is_started()mode.Maybe something like:
Quoted 8 lines
if (phy_is_started(phydev) && priv->firmware_failed) { dev_warn(&phydev->mdio.dev, "PHY firmware failure: link forced down"); phydev->state = PHY_HALTED; }Or maybe we just need to do that if
phydev->state==PHY_UPorPHY_RESUMING(the two states entered fromphy_start())?
Here's the fuller patch for what I'm suggesting:
drivers/net/phy/marvell10g.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/net/phy/marvell10g.c +20 -5
@@ -60,6 +60,8 @@ enum { };struct mv3310_priv { +bool firmware_failed; +struct device *hwmon_dev;char *hwmon_name; };
@@ -214,6 +216,10 @@ static int mv3310_probe(struct phy_device *phydev) (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)return -ENODEV ; + priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + ret =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MV_PMA_BOOT );if (ret <0 )return ret;
@@ -221,13 +227,9 @@ static int mv3310_probe(struct phy_device *phydev)if (ret &MV_PMA_BOOT_FATAL ) {dev_warn (&phydev->mdio.dev,"PHY failed to boot firmware, status=%04x\n" , ret); -return -ENODEV ; + priv->firmware_failed = true; } - priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; -dev_set_drvdata (&phydev->mdio.dev, priv); ret =mv3310_hwmon_probe (phydev);
@@ -247,6 +249,19 @@ static int mv3310_resume(struct phy_device *phydev)return mv3310_hwmon_config (phydev, true); } +static void mv3310_link_change_notify (struct phy_device *phydev) +{ +struct mv3310_priv *priv =dev_get_drvdata (&phydev->mdio.dev); +enum phy_state state = phydev->state; + +if (priv->firmware_failed && + (state ==PHY_UP || state ==PHY_RESUMING )) { +dev_warn (&phydev->mdio.dev, +"PHY firmware failure: link forced down" ); + phydev->state = state =PHY_HALTED ; + } +} +/* Some PHYs in the Alaska family such as the 88X3310 and the 88E2010 * don't set bit 14 in PMA Extended Abilities (1.11), although they do * support 2.5GBASET and 5GBASET. For these models, we can still read their
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Andrew Lunn
maintainerQuoted 50 lines
Here's the fuller patch for what I'm suggesting:
drivers/net/phy/marvell10g.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)drivers/net/phy/marvell10g.c +9
-5@@ -60,6 +60,8 @@ enum { };struct mv3310_priv { +bool firmware_failed; +struct device *hwmon_dev;char *hwmon_name; };@@ -214,6 +216,10 @@ static int mv3310_probe(struct phy_device *phydev) (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)return -ENODEV ; + priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL ); +if (!priv) +return -ENOMEM ; + ret =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MV_PMA_BOOT );if (ret <0 )return ret;@@ -221,13 +227,9 @@ static int mv3310_probe(struct phy_device *phydev)if (ret &MV_PMA_BOOT_FATAL ) {dev_warn (&phydev->mdio.dev,"PHY failed to boot firmware, status=%04x\n" , ret); -return -ENODEV ; + priv->firmware_failed = true; } - priv =devm_kzalloc (&phydev->mdio.dev,sizeof (*priv),GFP_KERNEL ); -if (!priv) -return -ENOMEM ; -dev_set_drvdata (&phydev->mdio.dev, priv); ret =mv3310_hwmon_probe (phydev);@@ -247,6 +249,19 @@ static int mv3310_resume(struct phy_device *phydev)return mv3310_hwmon_config (phydev, true); } +static void mv3310_link_change_notify (struct phy_device *phydev) +{
drivers/net/phy/marvell10g.c static int mv3310_resume(struct phy_device *phydev) · line 263
Quoted 10 lines
drivers/net/phy/marvell10g.c +10
-0+struct mv3310_priv *priv =dev_get_drvdata (&phydev->mdio.dev); +enum phy_state state = phydev->state; + +if (priv->firmware_failed && + (state ==PHY_UP || state ==PHY_RESUMING )) { +dev_warn (&phydev->mdio.dev, +"PHY firmware failure: link forced down" ); + phydev->state = state =PHY_HALTED ; + } +}
Hi Russell
This looks good.
Andrew
David Miller
maintainerFrom: Russell King <[email protected]>
Date: Tue, 28 May 2019 10:34:42 +0100
Quoted 5 lines
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
Signed-off-by Russell King <[email protected]>
Applied and queued up for -stable, thanks.
Longer term in net-next we can do the PHY_HALTED thing so that the PHY is accessible to update/fix the broken firmware.
Russell King - ARM Linux admin
maintainerQuoted 7 lines · David Miller
From: Russell King <[email protected]>
Date: Tue, 28 May 2019 10:34:42 +0100Quoted 4 lines
Some boards do not have the PHY firmware programmed in the 3310's flash, which leads to the PHY not working as expected. Warn the user when the PHY fails to boot the firmware and refuse to initialise.
Quoted 6 lines
Quoted 1 line
Signed-off-by Russell King <[email protected]>Applied and queued up for -stable, thanks.
Longer term in net-next we can do the
PHY_HALTEDthing so that the PHY is accessible to update/fix the broken firmware.
Thanks David.
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up