From: Paul Louvel <paul.louvel@bootlin.com>
To: Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Herve Codina <herve.codina@bootlin.com>,
"Paul Louvel (Schneider Electric)" <paul.louvel@bootlin.com>
Subject: [PATCH net-next v2 4/4] net: phy: marvell: add RGMII-to-Copper mode configuration
Date: Mon, 16 Nov 2026 16:27:04 +0100 [thread overview]
Message-ID: <20261116-marvell-phy-rgmii-v2-4-e04dca67e89a@bootlin.com> (raw)
In-Reply-To: <20261116-marvell-phy-rgmii-v2-0-e04dca67e89a@bootlin.com>
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) <paul.louvel@bootlin.com>
---
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
prev parent reply other threads:[~2026-11-16 15:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 15:27 [PATCH net-next v2 0/4] " Paul Louvel
2026-11-16 15:27 ` [PATCH net-next v2 1/4] net: phy: marvell: move mode configuration into standalone function Paul Louvel
2026-11-16 15:27 ` [PATCH net-next v2 2/4] net: phy: marvell: de-duplicate mode initialization code Paul Louvel
2026-11-16 15:27 ` [PATCH net-next v2 3/4] net: phy: marvell: factor out EEE errata initialization Paul Louvel
2026-11-16 15:27 ` Paul Louvel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116-marvell-phy-rgmii-v2-4-e04dca67e89a@bootlin.com \
--to=paul.louvel@bootlin.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=herve.codina@bootlin.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=miquel.raynal@bootlin.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®