evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: 246d7f773c ("net: dsa: add Broadcom SF2 switch driver")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2014-12-11 18:12:42 -08:00 • committed by David S. Miller
parent 697766df6b
commit 7855f675e6
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/net/dsa/bcm_sf2.c
View file

@ -684,10 +684,9 @@ static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,
struct fixed_phy_status *status) struct fixed_phy_status *status)
{ {
struct bcm_sf2_priv *priv = ds_to_priv(ds); struct bcm_sf2_priv *priv = ds_to_priv(ds);
u32 link, duplex, pause, speed; u32 duplex, pause, speed;
u32 reg; u32 reg;
link = core_readl(priv, CORE_LNKSTS);
duplex = core_readl(priv, CORE_DUPSTS); duplex = core_readl(priv, CORE_DUPSTS);
pause = core_readl(priv, CORE_PAUSESTS); pause = core_readl(priv, CORE_PAUSESTS);
speed = core_readl(priv, CORE_SPDSTS); speed = core_readl(priv, CORE_SPDSTS);
@ -701,22 +700,26 @@ 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 * 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 * level to get the data to flow. We do use what the interrupt handler
* did determine before. * did determine before.
*
* For the other ports, we just force the link status, since this is
* a fixed PHY device.
*/ */
if (port == 7) { if (port == 7) {
status->link = priv->port_sts[port].link; status->link = priv->port_sts[port].link;
reg = core_readl(priv, CORE_STS_OVERRIDE_GMIIP_PORT(7));
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; status->duplex = 1;
} else { } else {
status->link = !!(link & (1 << port)); status->link = 1;
status->duplex = !!(duplex & (1 << port)); 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(port));
switch (speed) { switch (speed) {
case SPDSTS_10: case SPDSTS_10:
status->speed = SPEED_10; status->speed = SPEED_10;