net: dsa: sja1105: fix sja1105_parse_rgmii_delays() (9bca3a0a) · Commits · 戴 / test

This function was using configuration of port 0 in devicetree for all ports. In case CPU port was not 0, the delay settings was ignored. This resulted not working communication between CPU and the switch. Fixes: ("net: dsa: sja1105: Error out if RGMII delays are requested in DT") Signed-off-by:

Oleksij Rempel <o.rempel@pengutronix.de> Reviewed-by:

Vladimir Oltean <olteanv@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/dsa/sja1105/sja1105_main.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -594,15 +594,15 @@ static int sja1105_parse_rgmii_delays(struct sja1105_private *priv,
		int i;

		for (i = 0; i < SJA1105_NUM_PORTS; i++) {
		if (ports->role == XMII_MAC)
		if (ports[i].role == XMII_MAC)
		continue;

		if (ports->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID \|\|
		ports->phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
		if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_RXID \|\|
		ports[i].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)
		if (ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_TXID \|\|
		ports[i].phy_mode == PHY_INTERFACE_MODE_RGMII_ID)
		priv->rgmii_tx_delay[i] = true;

		if ((priv->rgmii_rx_delay[i] \|\| priv->rgmii_tx_delay[i]) &&

Admin message