The 88E151x EEE errata sequence writes four register pairs on page 0xFF.
Using phy_write() for each access takes and releases the MDIO bus lock
every time, and returning early on error leaves the PHY on the errata
page.
Move the sequence into m88e1510_eee_errata() and use phy_select_page()
and phy_restore_page().
This reduces the number of bus lock/unlock cycles and restores the
previous page if one of the errata writes fails.
Signed-off-by: Paul Louvel (Schneider Electric) <redacted>
---
drivers/net/phy/marvell.c | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index d2c5d3c5ce7d..a72d307eaf12 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1353,7 +1353,7 @@ static int m88e1510_config_mode(struct phy_device *phydev, u16 mode)
return phy_restore_page(phydev, oldpage, ret);
}
-static int m88e1510_config_init(struct phy_device *phydev)
+static int m88e1510_eee_errata(struct phy_device *phydev)
{
static const struct {
u16 reg17, reg16;@@ -1363,31 +1363,40 @@ static int m88e1510_config_init(struct phy_device *phydev)
{ 0xb233, 0x214d },
{ 0xcc0c, 0x2159 },
};
- int err;
- int i;
+ int i, oldpage, ret = 0;
/* As per Marvell Release Notes - Alaska 88E1510/88E1518/88E1512/
* 88E1514 Rev A0, Errata Section 5.1:
* If EEE is intended to be used, the following register writes
* must be done once after every hardware reset.
*/
- err = marvell_set_page(phydev, 0x00FF);
- if (err < 0)
- return err;
+ oldpage = phy_select_page(phydev, 0x00FF);
+ if (oldpage < 0)
+ goto restore;
for (i = 0; i < ARRAY_SIZE(errata_vals); ++i) {
- err = phy_write(phydev, 17, errata_vals[i].reg17);
- if (err)
- return err;
- err = phy_write(phydev, 16, errata_vals[i].reg16);
- if (err)
- return err;
+ ret = __phy_write(phydev, 17, errata_vals[i].reg17);
+ if (ret)
+ goto restore;
+
+ ret = __phy_write(phydev, 16, errata_vals[i].reg16);
+ if (ret)
+ goto restore;
}
- err = marvell_set_page(phydev, 0x00FB);
- if (err < 0)
- return err;
- err = phy_write(phydev, 07, 0xC00D);
+restore:
+ ret = phy_restore_page(phydev, oldpage, ret);
+ if (ret < 0)
+ return ret;
+
+ return phy_write_paged(phydev, 0x00FB, 07, 0xC00D);
+}
+
+static int m88e1510_config_init(struct phy_device *phydev)
+{
+ int err;
+
+ err = m88e1510_eee_errata(phydev);
if (err < 0)
return err;
err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
--
2.56.1