Skip to contentSkip to conversation

request for 4.4-stable: 552165bcf7060 ("drivers: net: cpsw: fix parsing of phy-handle DT property in dual_emac config")

PATCH SZ Lin (林上智) 2 participants 2 messages Sep 12, 2018 – Sep 17, 2018

Subsystems (3)
Network drivers Stable branch TI Ethernet switch driver (cpsw)
lore
Share & tools
lore

SZ Lin (林上智)

author
#0 lore raw

Hi,

This patch is not marked for 4.4-stable, but it's already in 4.9 and 4.14 stable.

Please apply to 4.4-stable.

This patch fixed parsing of phy-handle DT property in dual_emac config.

--
SZ Lin (林上智)

Quoted 1 line

From 2123cdb99d4b7528fb0aa504ac873b66e386a243 Mon Sep 17 00:00:00 2001

From: David Rivshin <[email protected]>
Date: Wed, 27 Apr 2016 21:25:25 -0400
Subject: [PATCH] drivers: net: cpsw: fix parsing of phy-handle DT property in
dual_emac config

commit 552165bcf7060b998b4a9b5b86110b6a5e04dfd9 upstream

Commit 9e42f715264ff158478fa30eaed847f6e131366b ("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 9e42f715264f ("drivers: net: cpsw: add phy-handle parsing")
Signed-off-by David Rivshin <[email protected]>
Tested-by Nicolas Chauvet <[email protected]>
Tested-by Andrew Goodbody <[email protected]>
Reviewed-by Mugunthan V N <[email protected]>
Reviewed-by Grygorii Strashko <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Signed-off-by SZ Lin (林上智) <[email protected]>
---
 drivers/net/ethernet/ti/cpsw.c | 13 ++++++-------
 drivers/net/ethernet/ti/cpsw.h |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/ti/cpsw.c +6 -7
index c69b0bdd891d..c21c80a228d9 100644
@@ -371,7 +371,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;

@@ -1165,8 +1164,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,

@@ -1957,12 +1956,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;
 

@@ -2050,7 +2048,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;

@@ -2291,7 +2290,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
index 442a7038e660..e50afd1b2eda 100644
@@ -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];
Signature · 1 line
2.19.0
maintainer
#1 lore raw
Quoted 7 lines · SZ Lin (林上智)

Hi,

This patch is not marked for 4.4-stable, but it's already in 4.9 and 4.14 stable.

Please apply to 4.4-stable.

This patch fixed parsing of phy-handle DT property in dual_emac config.

Now applied, thanks.

greg k-h