net: dsa: sja1105: Error out if RGMII delays are requested in DT

Documentation/devicetree/bindings/net/ethernet.txt is confusing because
it says what the MAC should not do, but not what it *should* do:

  * "rgmii-rxid" (RGMII with internal RX delay provided by the PHY, the MAC
     should not add an RX delay in this case)

The gap in semantics is threefold:
1. Is it illegal for the MAC to apply the Rx internal delay by itself,
   and simplify the phy_mode (mask off "rgmii-rxid" into "rgmii") before
   passing it to of_phy_connect? The documentation would suggest yes.
1. For "rgmii-rxid", while the situation with the Rx clock skew is more
   or less clear (needs to be added by the PHY), what should the MAC
   driver do about the Tx delays? Is it an implicit wild card for the
   MAC to apply delays in the Tx direction if it can? What if those were
   already added as serpentine PCB traces, how could that be made more
   obvious through DT bindings so that the MAC doesn't attempt to add
   them twice and again potentially break the link?
3. If the interface is a fixed-link and therefore the PHY object is
   fixed (a purely software entity that obviously cannot add clock
   skew), what is the meaning of the above property?

So an interpretation of the RGMII bindings was chosen that hopefully
does not contradict their intention but also makes them more applied.
The SJA1105 driver understands to act upon "rgmii-*id" phy-mode bindings
if the port is in the PHY role (either explicitly, or if it is a
fixed-link). Otherwise it always passes the duty of setting up delays to
the PHY driver.

The error behavior that this patch adds is required on SJA1105E/T where
the MAC really cannot apply internal delays. If the other end of the
fixed-link cannot apply RGMII delays either (this would be specified
through its own DT bindings), then the situation requires PCB delays.

For SJA1105P/Q/R/S, this is however hardware supported and the error is
thus only temporary. I created a stub function pointer for configuring
delays per-port on RXC and TXC, and will implement it when I have access
to a board with this hardware setup.

Meanwhile do not allow the user to select an invalid configuration.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105.h b/drivers/net/dsa/sja1105/sja1105.h
index 50ab9282c4f177bcddad67c2b50a2df6c0a635c9..87dee6794d984baf939114ed8cea9d6fd6282031 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -48,11 +48,14 @@ struct sja1105_info {
        const struct sja1105_table_ops *static_ops;
        const struct sja1105_regs *regs;
        int (*reset_cmd)(const void *ctx, const void *data);
+       int (*setup_rgmii_delay)(const void *ctx, int port);
        const char *name;
 };
 
 struct sja1105_private {
        struct sja1105_static_config static_config;
+       bool rgmii_rx_delay[SJA1105_NUM_PORTS];
+       bool rgmii_tx_delay[SJA1105_NUM_PORTS];
        const struct sja1105_info *info;
        struct gpio_desc *reset_gpio;
        struct spi_device *spidev;

diff --git a/drivers/net/dsa/sja1105/sja1105_clocking.c b/drivers/net/dsa/sja1105/sja1105_clocking.c
index 598544297931136254955dc4156220c5b28ac744..94bfe0ee50a8edc4265e8dae641c765dc436de64 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_clocking.c
+++ b/drivers/net/dsa/sja1105/sja1105_clocking.c
@@ -427,7 +427,10 @@ static int sja1105_rgmii_clocking_setup(struct sja1105_private *priv, int port)
                dev_err(dev, "Failed to configure Tx pad registers\n");
                return rc;
        }
-       return 0;
+       if (!priv->info->setup_rgmii_delay)
+               return 0;
+
+       return priv->info->setup_rgmii_delay(priv, port);
 }
 
 static int sja1105_cgu_rmii_ref_clk_config(struct sja1105_private *priv,

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index ec8137eff22399ac8a5016b52659a7ed4500fc54..d27b9c178cba6b0aee172f4f50905caec028276c 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -518,6 +518,30 @@ static int sja1105_static_config_load(struct sja1105_private *priv,
        return sja1105_static_config_upload(priv);
 }
 
+static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,
+                                     const struct sja1105_dt_port *ports)
+{
+       int i;
+
+       for (i = 0; i < SJA1105_NUM_PORTS; i++) {
+               if (ports->role == XMII_MAC)
+                       continue;
+
+               if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID ||
+                   ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
+                       priv->rgmii_rx_delay[i] = true;
+
+               if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID ||
+                   ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
+                       priv->rgmii_tx_delay[i] = true;
+
+               if ((priv->rgmii_rx_delay[i] || priv->rgmii_tx_delay[i]) &&
+                    !priv->info->setup_rgmii_delay)
+                       return -EINVAL;
+       }
+       return 0;
+}
+
 static int sja1105_parse_ports_node(struct sja1105_private *priv,
                                    struct sja1105_dt_port *ports,
                                    struct device_node *ports_node)
@@ -959,6 +983,16 @@ static int sja1105_setup(struct dsa_switch *ds)
                dev_err(ds->dev, "Failed to parse DT: %d\n", rc);
                return rc;
        }
+
+       /* Error out early if internal delays are required through DT
+        * and we can't apply them.
+        */
+       rc = sja1105_parse_rgmii_delays(priv, ports);
+       if (rc < 0) {
+               dev_err(ds->dev, "RGMII delay not supported\n");
+               return rc;
+       }
+
        /* Create and send configuration down to device */
        rc = sja1105_static_config_load(priv, ports);
        if (rc < 0) {