Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac config 



Commit 9e42f715 ("drivers: net: cpsw: add
phy-handle parsing") saved the "phy-handle" phandle into a new cpsw_priv
field. However, phy connections are per-slave, so the phy_node field should
be in cpsw_slave_data rather than cpsw_priv.

This would go unnoticed in a single emac configuration. But in dual_emac
mode, the last "phy-handle" property parsed for either slave would be used
by both of them, causing them both to refer to the same phy_device.

Fixes: 9e42f715 ("drivers: net: cpsw: add phy-handle parsing")
Signed-off-by: default avatarDavid Rivshin <drivshin@allworx.com>
Tested-by: default avatarNicolas Chauvet <kwizart@gmail.com>
Tested-by: default avatarAndrew Goodbody <andrew.goodbody@cambrionix.com>
Reviewed-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbdd09eb

drivers/net/ethernet/ti/cpsw.c

+6 −7
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ struct cpsw_priv { 
	spinlock_t			lock;

	struct platform_device		*pdev;

	struct net_device		*ndev;

	struct device_node		*phy_node;

	struct napi_struct		napi_rx;

	struct napi_struct		napi_tx;

	struct device			*dev;
@@ -1148,8 +1147,8 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) 
		cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,

				   1 << slave_port, 0, 0, ALE_MCAST_FWD_2);



	if (priv->phy_node)

		slave->phy = of_phy_connect(priv->ndev, priv->phy_node,

	if (slave->data->phy_node)

		slave->phy = of_phy_connect(priv->ndev, slave->data->phy_node,

				 &cpsw_adjust_link, 0, slave->data->phy_if);

	else

		slave->phy = phy_connect(priv->ndev, slave->data->phy_id,
@@ -1940,12 +1939,11 @@ static void cpsw_slave_init(struct cpsw_slave *slave, struct cpsw_priv *priv, 
	slave->port_vlan = data->dual_emac_res_vlan;

}



static int cpsw_probe_dt(struct cpsw_priv *priv,

static int cpsw_probe_dt(struct cpsw_platform_data *data,

			 struct platform_device *pdev)

{

	struct device_node *node = pdev->dev.of_node;

	struct device_node *slave_node;

	struct cpsw_platform_data *data = &priv->data;

	int i = 0, ret;

	u32 prop;
@@ -2033,7 +2031,8 @@ static int cpsw_probe_dt(struct cpsw_priv *priv, 
		if (strcmp(slave_node->name, "slave"))

			continue;



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

		slave_data->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 device_node *phy_node;
@@ -2275,7 +2274,7 @@ static int cpsw_probe(struct platform_device *pdev) 
	/* Select default pin state */

	pinctrl_pm_select_default_state(&pdev->dev);



	if (cpsw_probe_dt(priv, pdev)) {

	if (cpsw_probe_dt(&priv->data, pdev)) {

		dev_err(&pdev->dev, "cpsw: platform data missing\n");

		ret = -ENODEV;

		goto clean_runtime_disable_ret;

drivers/net/ethernet/ti/cpsw.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/phy.h>



struct cpsw_slave_data {

	struct device_node *phy_node;

	char		phy_id[MII_BUS_ID_SIZE];

	int		phy_if;

	u8		mac_addr[ETH_ALEN];