[PATCH net-next v2 2/4] net: phy: marvell: de-duplicate mode initialization code

From: Paul Louvel

Date: Mon Nov 16 2026 - 10:28:45 EST


The code that initializes the m88e151x PHYs to use the SGMII-to-Copper
interface is duplicated, and does not restore the old page in case of an
error.

Instead, use m88e1510_config_mode().

Signed-off-by: Paul Louvel (Schneider Electric) <paul.louvel@xxxxxxxxxxx>
---
drivers/net/phy/marvell.c | 27 ++++-----------------------
1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index aef5f8279133..d2c5d3c5ce7d 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1395,30 +1395,11 @@ static int m88e1510_config_init(struct phy_device *phydev)
return err;

/* SGMII-to-Copper mode initialization */
- if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
- /* Select page 18 */
- err = marvell_set_page(phydev, 18);
- if (err < 0)
- return err;
-
- /* In reg 20, write MODE[2:0] = 0x1 (SGMII to Copper) */
- err = phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1,
- MII_88E1510_GEN_CTRL_REG_1_MODE_MASK,
- MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII);
- if (err < 0)
- return err;
-
- /* PHY reset is necessary after changing MODE[2:0] */
- err = phy_set_bits(phydev, MII_88E1510_GEN_CTRL_REG_1,
- MII_88E1510_GEN_CTRL_REG_1_RESET);
- if (err < 0)
- return err;
+ if (phydev->interface == PHY_INTERFACE_MODE_SGMII)
+ err = m88e1510_config_mode(phydev, MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII);
+ if (err < 0)
+ return err;

- /* Reset page selection */
- err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
- if (err < 0)
- return err;
- }
err = m88e1011_set_downshift(phydev, 3);
if (err < 0)
return err;

--
2.56.1