]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: dsa: mxl-gsw1xx: only setup SerDes PCS if it exists
authorDaniel Golle <daniel@makrotopia.org>
Thu, 22 Jan 2026 16:39:23 +0000 (16:39 +0000)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 27 Jan 2026 10:52:44 +0000 (11:52 +0100)
Older Intel GSW150 chip doesn't have a SGMII/1000Base-X/2500Base-X PCS.
Prepare for supporting Intel GSW150 by skipping PCS reset and
initialization in case no .mac_select_pcs operation is defined.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Link: https://patch.msgid.link/fd46a821b1535751cd7b478a04a9ffe1e9d4d289.1769099517.git.daniel@makrotopia.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/dsa/lantiq/mxl-gsw1xx.c

index ba72111a53ad0e49a8f7bb76b44b0caada7eef8e..c6fa93229349ab7f717c3460136c409c74a67a06 100644 (file)
@@ -615,6 +615,28 @@ static struct regmap *gsw1xx_regmap_init(struct gsw1xx_priv *priv,
                                priv, &config);
 }
 
+static int gsw1xx_serdes_pcs_init(struct gsw1xx_priv *priv)
+{
+       /* do nothing if the chip doesn't have a SerDes PCS */
+       if (!priv->gswip.hw_info->mac_select_pcs)
+               return 0;
+
+       priv->pcs.ops = &gsw1xx_pcs_ops;
+       priv->pcs.poll = true;
+       __set_bit(PHY_INTERFACE_MODE_SGMII,
+                 priv->pcs.supported_interfaces);
+       __set_bit(PHY_INTERFACE_MODE_1000BASEX,
+                 priv->pcs.supported_interfaces);
+       if (priv->gswip.hw_info->supports_2500m)
+               __set_bit(PHY_INTERFACE_MODE_2500BASEX,
+                         priv->pcs.supported_interfaces);
+       priv->tbi_interface = PHY_INTERFACE_MODE_NA;
+
+       /* assert SGMII reset to power down SGMII unit */
+       return regmap_set_bits(priv->shell, GSW1XX_SHELL_RST_REQ,
+                              GSW1XX_RST_REQ_SGMII_SHELL);
+}
+
 static int gsw1xx_probe(struct mdio_device *mdiodev)
 {
        struct device *dev = &mdiodev->dev;
@@ -667,20 +689,7 @@ static int gsw1xx_probe(struct mdio_device *mdiodev)
        if (IS_ERR(priv->shell))
                return PTR_ERR(priv->shell);
 
-       priv->pcs.ops = &gsw1xx_pcs_ops;
-       priv->pcs.poll = true;
-       __set_bit(PHY_INTERFACE_MODE_SGMII,
-                 priv->pcs.supported_interfaces);
-       __set_bit(PHY_INTERFACE_MODE_1000BASEX,
-                 priv->pcs.supported_interfaces);
-       if (priv->gswip.hw_info->supports_2500m)
-               __set_bit(PHY_INTERFACE_MODE_2500BASEX,
-                         priv->pcs.supported_interfaces);
-       priv->tbi_interface = PHY_INTERFACE_MODE_NA;
-
-       /* assert SGMII reset to power down SGMII unit */
-       ret = regmap_set_bits(priv->shell, GSW1XX_SHELL_RST_REQ,
-                             GSW1XX_RST_REQ_SGMII_SHELL);
+       ret = gsw1xx_serdes_pcs_init(priv);
        if (ret < 0)
                return ret;