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

Commit 7855f675 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: dsa: bcm_sf2: force link for all fixed PHY devices 



For ports of the switch that we define as "fixed PHYs" such as MoCA, we
would have our Port 7 special handling that would allow us to assert the
link status indication.

For other ports, such as e.g: RGMII_1 connected to a cable modem, we
would rely on whatever the bootloader has left configured, which is a
bad assumption to make, we really need to force the link status
indication here.

Fixes: 246d7f77 ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 697766df

drivers/net/dsa/bcm_sf2.c

+13 −10
Original line number Diff line number Diff line
@@ -684,10 +684,9 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, 
					 struct fixed_phy_status *status)

{

	struct bcm_sf2_priv *priv = ds_to_priv(ds);

	u32 link, duplex, pause, speed;

	u32 duplex, pause, speed;

	u32 reg;



	link = core_readl(priv, CORE_LNKSTS);

	duplex = core_readl(priv, CORE_DUPSTS);

	pause = core_readl(priv, CORE_PAUSESTS);

	speed = core_readl(priv, CORE_SPDSTS);
@@ -701,21 +700,25 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, 
	 * which means that we need to force the link at the port override

	 * level to get the data to flow. We do use what the interrupt handler

	 * did determine before.

	 *

	 * For the other ports, we just force the link status, since this is

	 * a fixed PHY device.

	 */

	if (port == 7) {

		status->link = priv->port_sts[port].link;

		reg = core_readl(priv, CORE_STS_OVERRIDE_GMIIP_PORT(7));

		status->duplex = 1;

	} else {

		status->link = 1;

		status->duplex = !!(duplex & (1 << port));

	}



	reg = core_readl(priv, CORE_STS_OVERRIDE_GMIIP_PORT(port));

	reg |= SW_OVERRIDE;

	if (status->link)

		reg |= LINK_STS;

	else

		reg &= ~LINK_STS;

		core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(7));

		status->duplex = 1;

	} else {

		status->link = !!(link & (1 << port));

		status->duplex = !!(duplex & (1 << port));

	}

	core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));



	switch (speed) {

	case SPDSTS_10: