net: bcmgenet: Power on integrated GPHY in bcmgenet_power_up()

ffainelli · davem330 · commit bd4060a6108b · 2015-07-20T20:48:14.000-07:00
We are currently disabling the GPHY interface during bcmgenet_close(), and attempting to power it back on during bcmgenet_open(). This works fine for the first time, because we called bcmgenet_mii_config() which took care of enabling the interface, however, bcmgenet_power_up() really needs to power on the GPHY for correctness. This will be particularly important as we want to move bcmgenet_mii_probe() down to bcmgenet_open() to avoid seeing the "PHY already attached" message. Fixes: a642c4f ("net: bcmgenet: power up and down integrated GPHY when unused") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -907,6 +907,8 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,
 	}
 
 	bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);
+	if (mode == GENET_POWER_PASSIVE)
+		bcmgenet_phy_power_set(priv->dev, true);
 }
 
 /* ioctl handle special commands that are not present in ethtool. */

Original file line number	Diff line number	Diff line change
`@@ -907,6 +907,8 @@ static void bcmgenet_power_up(struct bcmgenet_priv *priv,`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`bcmgenet_ext_writel(priv, reg, EXT_EXT_PWR_MGMT);`
	`910`	`+ if (mode == GENET_POWER_PASSIVE)`
	`911`	`+ bcmgenet_phy_power_set(priv->dev, true);`
`910`	`912`	`}`
`911`	`913`
`912`	`914`	`/* ioctl handle special commands that are not present in ethtool. */`