Commit f1eea5c1 authored by David Rivshin's avatar David Rivshin Committed by David S. Miller
Browse files

drivers: net: cpsw: fix RMII/RGMII mode when used with fixed-link PHY 



Commit 1f71e8c9 ("drivers: net: cpsw: Add
support for fixed-link PHY") did not parse the "phy-mode" property in
the case of a fixed-link PHY, leaving slave_data->phy_if with its default
of PHY_INTERFACE_MODE_NA(0). This later gets passed to phy_connect() in
cpsw_slave_open(), and eventually to cpsw_phy_sel() where it hits a default
case that configures the MAC for MII mode.

The user visible symptom is that while kernel log messages seem to indicate
that the interface is set up, there is no network communication. Eventually
a watchdog error occurs:
    NETDEV WATCHDOG: eth0 (cpsw): transmit queue 0 timed out

Fixes: 1f71e8c9 ("drivers: net: cpsw: Add support for fixed-link PHY")
Signed-off-by: default avatarDavid Rivshin <drivshin@allworx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1873c58d

Documentation/devicetree/bindings/net/cpsw.txt

+3 −3
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ Optional properties: 


Slave Properties:

Required properties:

- phy_id		: Specifies slave phy id

- phy-mode		: See ethernet.txt file in the same directory



Optional properties:

- dual_emac_res_vlan	: Specifies VID to be used to segregate the ports

- mac-address		: See ethernet.txt file in the same directory

- phy_id		: Specifies slave phy id

- phy-handle		: See ethernet.txt file in the same directory



Slave sub-nodes:

- fixed-link		: See fixed-link.txt file in the same directory

			  Either the properties phy_id and phy-mode,

			  or the sub-node fixed-link can be specified

			  Either the property phy_id, or the sub-node

			  fixed-link can be specified



Note: "ti,hwmods" field is used to fetch the base address and irq

resources from TI, omap hwmod data base during device registration.

drivers/net/ethernet/ti/cpsw.c

+22 −18
Original line number Diff line number Diff line
@@ -2026,17 +2026,15 @@ static int cpsw_probe_dt(struct cpsw_priv *priv, 
	for_each_child_of_node(node, slave_node) {

		struct cpsw_slave_data *slave_data = data->slave_data + i;

		const void *mac_addr = NULL;

		u32 phyid;

		int lenp;

		const __be32 *parp;

		struct device_node *mdio_node;

		struct platform_device *mdio;



		/* This is no slave child node, continue */

		if (strcmp(slave_node->name, "slave"))

			continue;



		priv->phy_node = of_parse_phandle(slave_node, "phy-handle", 0);

		parp = of_get_property(slave_node, "phy_id", &lenp);

		if (of_phy_is_fixed_link(slave_node)) {

			struct phy_device *pd;
@@ -2048,11 +2046,13 @@ static int cpsw_probe_dt(struct cpsw_priv *priv, 
				return -ENODEV;

			snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),

				 PHY_ID_FMT, pd->bus->id, pd->addr);

			goto no_phy_slave;

		}

		parp = of_get_property(slave_node, "phy_id", &lenp);

		if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {

			dev_err(&pdev->dev, "Missing slave[%d] phy_id property\n", i);

		} else if (parp) {

			u32 phyid;

			struct device_node *mdio_node;

			struct platform_device *mdio;



			if (lenp != (sizeof(__be32) * 2)) {

				dev_err(&pdev->dev, "Invalid slave[%d] phy_id property\n", i);

				goto no_phy_slave;

			}

			mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));
@@ -2065,6 +2065,10 @@ static int cpsw_probe_dt(struct cpsw_priv *priv, 
			}

			snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),

				 PHY_ID_FMT, mdio->name, phyid);

		} else {

			dev_err(&pdev->dev, "No slave[%d] phy_id or fixed-link property\n", i);

			goto no_phy_slave;

		}

		slave_data->phy_if = of_get_phy_mode(slave_node);

		if (slave_data->phy_if < 0) {

			dev_err(&pdev->dev, "Missing or malformed slave[%d] phy-mode property\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE