net: dsa: mv88e6xxx: Make sure to configure ports with external PHYs
Subsystems (4)
PATCH 1/1 net: dsa: mv88e6xxx: Make sure to configure ports with external PHYs
The MV88E6xxx can have external PHYs attached to certain ports and those PHYs could even be on different MDIO bus than the one within the switch. This patch makes sure that ports with such PHYs are configured correctly according to the information provided by the PHY.
--- drivers/net/dsa/mv88e6xxx/chip.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +14 -2
@@ -575,6 +575,13 @@ static int mv88e6xxx_port_setup_mac(struct mv88e6xxx_chip *chip, int port,return err; } +static int mv88e6xxx_phy_is_internal (struct dsa_switch *ds,int port) +{ +struct mv88e6xxx_chip *chip = ds->priv; + +return port < chip->info->num_internal_phys; +} +/* We expect the switch to perform auto negotiation if there is a real * phy. However, in the case of a fixed link phy, we force the port * settings from the fixed link settings.
@@ -585,7 +592,8 @@ static void mv88e6xxx_adjust_link(struct dsa_switch *ds, int port,struct mv88e6xxx_chip *chip = ds->priv;int err; -if (!phy_is_pseudo_fixed_link (phydev)) +if (!phy_is_pseudo_fixed_link (phydev) && +mv88e6xxx_phy_is_internal (ds, port))return ;mutex_lock (&chip->reg_lock);
@@ -709,13 +717,17 @@ static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port,struct mv88e6xxx_chip *chip = ds->priv;int speed, duplex, link, pause, err; -if (mode ==MLO_AN_PHY ) +if ((mode ==MLO_AN_PHY ) &&mv88e6xxx_phy_is_internal (ds, port))return ;if (mode ==MLO_AN_FIXED ) { link =LINK_FORCED_UP ; speed = state->speed; duplex = state->duplex; + }else if (!mv88e6xxx_phy_is_internal (ds, port)) { + link = state->link; + speed = state->speed; + duplex = state->duplex; }else { speed =SPEED_UNFORCED ; duplex =DUPLEX_UNFORCED ;
Signature · 1 line
2.18.0
Quoted 7 lines · Marek Vasut
The MV88E6xxx can have external PHYs attached to certain ports and those PHYs could even be on different MDIO bus than the one within the switch. This patch makes sure that ports with such PHYs are configured correctly according to the information provided by the PHY.
Signed-off-by Marek Vasut <[email protected]>Cc Andrew Lunn <[email protected]>
Andrew
Andrew Lunn
maintainerQuoted 4 lines · Marek Vasut
The MV88E6xxx can have external PHYs attached to certain ports and those PHYs could even be on different MDIO bus than the one within the switch. This patch makes sure that ports with such PHYs are configured correctly according to the information provided by the PHY.
Hi Marek
For the netdev subsystem, you should put in the subject line which tree the patch is for.
[PATCH net-next] net: dsa: mv88e6xxx: Make sure to configure ports with external PHYs
Andrew
Quoted 6 lines · Andrew Lunn
Quoted 4 lines · Marek Vasut
The MV88E6xxx can have external PHYs attached to certain ports and those PHYs could even be on different MDIO bus than the one within the switch. This patch makes sure that ports with such PHYs are configured correctly according to the information provided by the PHY.
Quoted 6 lines
Hi Marek
For the netdev subsystem, you should put in the subject line which tree the patch is for.
[PATCH net-next] net: dsa: mv88e6xxx: Make sure to configure ports with external PHYs
Oh, is that how it works ? All right, thanks for the heads-up.
Signature · 2 lines
Best regards, Marek Vasut
From: Marek Vasut <[email protected]>
Date: Wed, 12 Sep 2018 00:15:24 +0200
Quoted 6 lines
The MV88E6xxx can have external PHYs attached to certain ports and those PHYs could even be on different MDIO bus than the one within the switch. This patch makes sure that ports with such PHYs are configured correctly according to the information provided by the PHY.
Signed-off-by Marek Vasut <[email protected]>
Applied to net-next.