Commit 21a2774e authored Sep 28, 2017 by Florian Fainelli Committed by David S. Miller Oct 01, 2017

Revert "net: dsa: bcm_sf2: Defer port enabling to calling port_enable"



This reverts commit e85ec74a ("net: dsa: bcm_sf2: Defer port
enabling to calling port_enable") because this now makes an unbind
followed by a bind to fail connecting to the ingrated PHY.

What this patch missed is that we need the PHY to be enabled with
bcm_sf2_gphy_enable_set() before probing it on the MDIO bus. This is
correctly done in the ops->setup() function, but by the time
ops->port_enable() runs, this is too late. Upon unbind we would power
down the PHY, and so when we would bind again, the PHY would be left
powered off.

Fixes: e85ec74a ("net: dsa: bcm_sf2: Defer port enabling to calling port_enable")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a6992ebe

drivers/net/dsa/bcm_sf2.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -754,11 +754,14 @@ static int bcm_sf2_sw_setup(struct dsa_switch *ds)
		struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
		unsigned int port;

		/* Disable unused ports and configure IMP port */
		/* Enable all valid ports and disable those unused */
		for (port = 0; port < priv->hw_params.num_ports; port++) {
		if (dsa_is_cpu_port(ds, port))
		/* IMP port receives special treatment */
		if ((1 << port) & ds->enabled_port_mask)
		bcm_sf2_port_setup(ds, port, NULL);
		else if (dsa_is_cpu_port(ds, port))
		bcm_sf2_imp_setup(ds, port);
		else if (!((1 << port) & ds->enabled_port_mask))
		else
		bcm_sf2_port_disable(ds, port, NULL);
		}