net: dsa: sja1105: add a PHY interface type compatibility matrix

On the SJA1105, all ports support the parallel "xMII" protocols (MII,
RMII, RGMII) except for port 4 on SJA1105R/S which supports only SGMII.
This was relatively easy to model, by special-casing the SGMII port.

On the SJA1110, certain ports can be pinmuxed between SGMII and xMII, or
between SGMII and an internal 100base-TX PHY. This creates problems,
because the driver's assumption so far was that if a port supports
SGMII, it uses SGMII.

We allow the device tree to tell us how the port pinmuxing is done, and
check that against a PHY interface type compatibility matrix for
plausibility.

The other big change is that instead of doing SGMII configuration based
on what the port supports, we do it based on what is the configured
phy_mode of the port.

The 2500base-x support added in this patch is not complete.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index d5c0217b1f656b194c18886dfb3d60f512f490b7..a27841642693f2b3417e25128c7a669ee8f02719 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -111,6 +111,11 @@ struct sja1105_info {
                                enum packing_op op);
        int (*clocking_setup)(struct sja1105_private *priv);
        const char *name;
+       bool supports_mii[SJA1105_MAX_NUM_PORTS];
+       bool supports_rmii[SJA1105_MAX_NUM_PORTS];
+       bool supports_rgmii[SJA1105_MAX_NUM_PORTS];
+       bool supports_sgmii[SJA1105_MAX_NUM_PORTS];
+       bool supports_2500basex[SJA1105_MAX_NUM_PORTS];
 };
 
 enum sja1105_key_type {

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index e4932243d0d3fa39d7590a16d8d15e0f9da13540..3682b04d37cb14cc40cfb82fef6ea9aa5c8f6d12 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -143,21 +143,6 @@ static int sja1105_init_mac_settings(struct sja1105_private *priv)
        return 0;
 }
 
-static bool sja1105_supports_sgmii(struct sja1105_private *priv, int port)
-{
-       if (priv->info->part_no != SJA1105R_PART_NO &&
-           priv->info->part_no != SJA1105S_PART_NO)
-               return false;
-
-       if (port != SJA1105_SGMII_PORT)
-               return false;
-
-       if (dsa_is_unused_port(priv->ds, port))
-               return false;
-
-       return true;
-}
-
 static int sja1105_init_mii_settings(struct sja1105_private *priv,
                                     struct sja1105_dt_port *ports)
 {
@@ -191,25 +176,42 @@ static int sja1105_init_mii_settings(struct sja1105_private *priv,
 
                switch (ports[i].phy_mode) {
                case PHY_INTERFACE_MODE_MII:
+                       if (!priv->info->supports_mii[i])
+                               goto unsupported;
+
                        mii->xmii_mode[i] = XMII_MODE_MII;
                        break;
                case PHY_INTERFACE_MODE_RMII:
+                       if (!priv->info->supports_rmii[i])
+                               goto unsupported;
+
                        mii->xmii_mode[i] = XMII_MODE_RMII;
                        break;
                case PHY_INTERFACE_MODE_RGMII:
                case PHY_INTERFACE_MODE_RGMII_ID:
                case PHY_INTERFACE_MODE_RGMII_RXID:
                case PHY_INTERFACE_MODE_RGMII_TXID:
+                       if (!priv->info->supports_rgmii[i])
+                               goto unsupported;
+
                        mii->xmii_mode[i] = XMII_MODE_RGMII;
                        break;
                case PHY_INTERFACE_MODE_SGMII:
-                       if (!sja1105_supports_sgmii(priv, i))
-                               return -EINVAL;
+                       if (!priv->info->supports_sgmii[i])
+                               goto unsupported;
+
+                       mii->xmii_mode[i] = XMII_MODE_SGMII;
+                       break;
+               case PHY_INTERFACE_MODE_2500BASEX:
+                       if (!priv->info->supports_2500basex[i])
+                               goto unsupported;
+
                        mii->xmii_mode[i] = XMII_MODE_SGMII;
                        break;
+unsupported:
                default:
-                       dev_err(dev, "Unsupported PHY mode %s!\n",
-                               phy_modes(ports[i].phy_mode));
+                       dev_err(dev, "Unsupported PHY mode %s on port %d!\n",
+                               phy_modes(ports[i].phy_mode), i);
                        return -EINVAL;
                }
 
@@ -999,10 +1001,8 @@ static int sja1105_speed[] = {
 static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
                                      int speed_mbps)
 {
-       struct sja1105_xmii_params_entry *mii;
        struct sja1105_mac_config_entry *mac;
        struct device *dev = priv->ds->dev;
-       sja1105_phy_interface_t phy_mode;
        sja1105_speed_t speed;
        int rc;
 
@@ -1013,7 +1013,6 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
         * reasonable approximation for both E/T and P/Q/R/S.
         */
        mac = priv->static_config.tables[BLK_IDX_MAC_CONFIG].entries;
-       mii = priv->static_config.tables[BLK_IDX_XMII_PARAMS].entries;
 
        switch (speed_mbps) {
        case SPEED_UNKNOWN:
@@ -1047,7 +1046,7 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
         * Actually for the SGMII port, the MAC is fixed at 1 Gbps and
         * we need to configure the PCS only (if even that).
         */
-       if (sja1105_supports_sgmii(priv, port))
+       if (priv->phy_mode[port] == PHY_INTERFACE_MODE_SGMII)
                mac[port].speed = SJA1105_SPEED_1000MBPS;
        else
                mac[port].speed = speed;
@@ -1066,8 +1065,7 @@ static int sja1105_adjust_port_config(struct sja1105_private *priv, int port,
         * the clock setup does interrupt the clock signal for a certain time
         * which causes trouble for all PHYs relying on this signal.
         */
-       phy_mode = mii->xmii_mode[port];
-       if (phy_mode != XMII_MODE_RGMII)
+       if (!phy_interface_mode_is_rgmii(priv->phy_mode[port]))
                return 0;
 
        return sja1105_clocking_setup_port(priv, port);
@@ -1091,7 +1089,9 @@ static void sja1105_mac_config(struct dsa_switch *ds, int port,
                               const struct phylink_link_state *state)
 {
        struct sja1105_private *priv = ds->priv;
-       bool is_sgmii = sja1105_supports_sgmii(priv, port);
+       bool is_sgmii;
+
+       is_sgmii = (state->interface == PHY_INTERFACE_MODE_SGMII);
 
        if (sja1105_phy_mode_mismatch(priv, port, state->interface)) {
                dev_err(ds->dev, "Changing PHY mode to %s not supported!\n",
@@ -1128,7 +1128,8 @@ static void sja1105_mac_link_up(struct dsa_switch *ds, int port,
 
        sja1105_adjust_port_config(priv, port, speed);
 
-       if (sja1105_supports_sgmii(priv, port) && !phylink_autoneg_inband(mode))
+       if (priv->phy_mode[port] == PHY_INTERFACE_MODE_SGMII &&
+           !phylink_autoneg_inband(mode))
                sja1105_sgmii_pcs_force_speed(priv, port, speed);
 
        sja1105_inhibit_tx(priv, BIT(port), false);
@@ -1885,7 +1886,7 @@ int sja1105_static_config_reload(struct sja1105_private *priv,
                speed_mbps[i] = sja1105_speed[mac[i].speed];
                mac[i].speed = SJA1105_SPEED_AUTO;
 
-               if (sja1105_supports_sgmii(priv, i))
+               if (priv->phy_mode[i] == PHY_INTERFACE_MODE_SGMII)
                        bmcr[i] = sja1105_sgmii_read(priv, i,
                                                     MDIO_MMD_VEND2,
                                                     MDIO_CTRL1);
@@ -1942,7 +1943,7 @@ out_unlock_ptp:
                if (rc < 0)
                        goto out;
 
-               if (!sja1105_supports_sgmii(priv, i))
+               if (priv->phy_mode[i] != PHY_INTERFACE_MODE_SGMII)
                        continue;
 
                an_enabled = !!(bmcr[i] & BMCR_ANENABLE);

diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c
index 615e0906b1fa0dd513df612202d89d779a192ef9..565b594efa7d30ba9aba935aab885b0ca33895cd 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_spi.c
+++ b/drivers/net/dsa/sja1105/sja1105_spi.c
@@ -482,6 +482,9 @@ const struct sja1105_info sja1105e_info = {
        .ptp_cmd_packing        = sja1105et_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105et_regs,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
        .name                   = "SJA1105E",
 };
 
@@ -502,6 +505,9 @@ const struct sja1105_info sja1105t_info = {
        .ptp_cmd_packing        = sja1105et_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105et_regs,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
        .name                   = "SJA1105T",
 };
 
@@ -523,6 +529,9 @@ const struct sja1105_info sja1105p_info = {
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
        .name                   = "SJA1105P",
 };
 
@@ -544,6 +553,9 @@ const struct sja1105_info sja1105q_info = {
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
        .name                   = "SJA1105Q",
 };
 
@@ -565,6 +577,10 @@ const struct sja1105_info sja1105r_info = {
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
+       .supports_sgmii         = {false, false, false, false, true},
        .name                   = "SJA1105R",
 };
 
@@ -586,5 +602,9 @@ const struct sja1105_info sja1105s_info = {
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
        .clocking_setup         = sja1105_clocking_setup,
+       .supports_mii           = {true, true, true, true, true},
+       .supports_rmii          = {true, true, true, true, true},
+       .supports_rgmii         = {true, true, true, true, true},
+       .supports_sgmii         = {false, false, false, false, true},
        .name                   = "SJA1105S",
 };