From: "Marek Behún" <kabel@kernel•org>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, "Marek Behún" <kabel@kernel•org>,
"Andrew Lunn" <andrew@lunn•ch>,
"Russell King" <rmk+kernel@armlinux•org.uk>
Subject: [PATCH net-next v2 4/5] net: phy: marvell10g: change MACTYPE if underlying MAC does not support it
Date: Thu, 29 Oct 2020 23:25:08 +0100 [thread overview]
Message-ID: <20201029222509.27201-5-kabel@kernel.org> (raw)
In-Reply-To: <20201029222509.27201-1-kabel@kernel.org>
RollBall SFPs contain a Marvell 88X3310 PHY, but by default the MACTYPE
is set to 10GBASE-R with Rate Matching.
Some devices (for example those based on Armada 38x) only support up to
2500base-x SerDes modes.
Change the PHY's MACTYPE to 4 (which means changing between 10gbase-r,
5gbase-r, 2500base-x ans SGMII depending on copper speed) if this is the
case (which is infered from phydev->interface).
Signed-off-by: Marek Behún <kabel@kernel•org>
Cc: Andrew Lunn <andrew@lunn•ch>
Cc: Russell King <rmk+kernel@armlinux•org.uk>
---
drivers/net/phy/marvell10g.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index 1901ba277413..9e8e9aa66972 100644
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -453,6 +453,33 @@ static bool mv3310_has_pma_ngbaset_quirk(struct phy_device *phydev)
MV_PHY_ALASKA_NBT_QUIRK_MASK) == MV_PHY_ALASKA_NBT_QUIRK_REV;
}
+static int mv3310_select_mactype(struct phy_device *phydev)
+{
+ int mac_type, ret;
+
+ /* On some devices the MAC does not support 10G mode, but may support
+ * lower modes, such as SGMII or 2500base-x.
+ * By changing MACTYPE of the PHY to 4 in this case, we ensure that
+ * the MAC will link with the PHY at least for these lower speeds.
+ */
+ switch (phydev->interface) {
+ case PHY_INTERFACE_MODE_SGMII:
+ case PHY_INTERFACE_MODE_2500BASEX:
+ mac_type = 4;
+ break;
+ default:
+ return 0;
+ }
+
+ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,
+ MV_V2_PORT_MAC_TYPE_MASK, mac_type);
+ if (ret <= 0)
+ return ret;
+
+ return phy_modify_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,
+ MV_V2_PORT_CTRL_SWRST, MV_V2_PORT_CTRL_SWRST);
+}
+
static int mv3310_config_init(struct phy_device *phydev)
{
struct mv3310_priv *priv = dev_get_drvdata(&phydev->mdio.dev);
@@ -474,6 +501,10 @@ static int mv3310_config_init(struct phy_device *phydev)
if (err)
return err;
+ err = mv3310_select_mactype(phydev);
+ if (err)
+ return err;
+
val = phy_read_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL);
if (val < 0)
return val;
--
2.26.2
next prev parent reply other threads:[~2020-10-29 22:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 22:25 [PATCH net-next v2 0/5] Support for RollBall 10G copper SFP modules Marek Behún
2020-10-29 22:25 ` [PATCH net-next v2 1/5] net: phy: mdio-i2c: support I2C MDIO protocol for RollBall " Marek Behún
2020-10-30 15:20 ` Russell King - ARM Linux admin
2020-10-29 22:25 ` [PATCH net-next v2 2/5] net: phylink: allow attaching phy for SFP modules on 802.3z mode Marek Behún
2020-10-30 16:29 ` Russell King - ARM Linux admin
2020-10-29 22:25 ` [PATCH net-next v2 3/5] net: sfp: create/destroy I2C mdiobus before PHY probe/after PHY release Marek Behún
2020-10-30 16:31 ` Russell King - ARM Linux admin
2020-10-29 22:25 ` Marek Behún [this message]
2020-10-29 22:25 ` [PATCH net-next v2 5/5] net: sfp: add support for multigig RollBall transceivers Marek Behún
2020-10-30 16:33 ` Russell King - ARM Linux admin
2020-10-30 15:01 ` [PATCH net-next v2 0/5] Support for RollBall 10G copper SFP modules Russell King - ARM Linux admin
2020-10-30 15:29 ` Vladimir Oltean
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=20201029222509.27201-5-kabel@kernel.org \
--to=kabel@kernel$(echo .)org \
--cc=andrew@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rmk+kernel@armlinux$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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