The driver currently programs the mode only for SGMII-to-Copper, based
on the PHY interface mode.
Some MACs connect to the PHY via RGMII. Add code in
m88e1510_config_init() to configure the device.
Do not overwrite the media interface mode configured via
m88e1510_port_configure_serdes().
Signed-off-by: Paul Louvel (Schneider Electric) <redacted>
---
drivers/net/phy/marvell.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index a72d307eaf12..9748fdd843ff 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1341,6 +1341,23 @@ static int m88e1510_config_mode(struct phy_device *phydev, u16 mode)
if (oldpage < 0)
goto error;
+ ret = __phy_read(phydev, MII_88E1510_GEN_CTRL_REG_1);
+ if (ret < 0)
+ goto error;
+
+ if (mode == MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII) {
+ switch (FIELD_GET(MII_88E1510_GEN_CTRL_REG_1_MODE_MASK, ret)) {
+ case MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII:
+ case MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII_1000X:
+ case MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII_100FX:
+ case MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII_SGMII:
+ ret = 0;
+ goto error;
+ default:
+ break;
+ }
+ }
+
ret = __phy_modify(phydev, MII_88E1510_GEN_CTRL_REG_1,
MII_88E1510_GEN_CTRL_REG_1_MODE_MASK, mode);
if (ret < 0)@@ -1403,9 +1420,11 @@ static int m88e1510_config_init(struct phy_device *phydev)
if (err < 0)
return err;
- /* SGMII-to-Copper mode initialization */
+ /* RGMII/SGMII-to-Copper mode initialization */
if (phydev->interface == PHY_INTERFACE_MODE_SGMII)
err = m88e1510_config_mode(phydev, MII_88E1510_GEN_CTRL_REG_1_MODE_SGMII);
+ else if (phy_interface_is_rgmii(phydev))
+ err = m88e1510_config_mode(phydev, MII_88E1510_GEN_CTRL_REG_1_MODE_RGMII);
if (err < 0)
return err;
--
2.56.1