| Message ID | E1nc3Dd-004hq7-Co@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: dsa: mt7530: updates for phylink changes | expand |
On Wed, 06 Apr 2022 11:48:57 +0100 Russell King (Oracle) wrote: > - if (state->interface != PHY_INTERFACE_MODE_MII) { > + if (state->interface != PHY_INTERFACE_MODE_MII && > + state->interface != PHY_INTERFACE_MODE_2500BASEX) > phylink_set(mask, 1000baseT_Full); > phylink_set(mask, 1000baseX_Full); > } Missing { here. Dunno if kbuild bot told you already.
On Wed, 6 Apr 2022 11:52:50 -0700 Jakub Kicinski <kuba@kernel.org> wrote: > On Wed, 06 Apr 2022 11:48:57 +0100 Russell King (Oracle) wrote: > > - if (state->interface != PHY_INTERFACE_MODE_MII) { > > + if (state->interface != PHY_INTERFACE_MODE_MII && > > + state->interface != PHY_INTERFACE_MODE_2500BASEX) > > phylink_set(mask, 1000baseT_Full); > > phylink_set(mask, 1000baseX_Full); > > } > > Missing { here. Dunno if kbuild bot told you already. Probably not, because next patch removes this code entirely :)
On Wed, Apr 06, 2022 at 10:34:43PM +0200, Marek Behún wrote: > On Wed, 6 Apr 2022 11:52:50 -0700 > Jakub Kicinski <kuba@kernel.org> wrote: > > > On Wed, 06 Apr 2022 11:48:57 +0100 Russell King (Oracle) wrote: > > > - if (state->interface != PHY_INTERFACE_MODE_MII) { > > > + if (state->interface != PHY_INTERFACE_MODE_MII && > > > + state->interface != PHY_INTERFACE_MODE_2500BASEX) > > > phylink_set(mask, 1000baseT_Full); > > > phylink_set(mask, 1000baseX_Full); > > > } > > > > Missing { here. Dunno if kbuild bot told you already. > > Probably not, because next patch removes this code entirely :) kbuild bot normally does catch these if I've missed them locally, but I find the bot is very very sporadic. Thanks for spotting it.
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 868d1af646f7..0c30d8586062 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2522,13 +2522,14 @@ static int mt7531_rgmii_setup(struct mt7530_priv *priv, u32 port, } static void mt7531_sgmii_validate(struct mt7530_priv *priv, int port, + phy_interface_t interface, unsigned long *supported) { /* Port5 supports ethier RGMII or SGMII. * Port6 supports SGMII only. */ - if (port == 6 || - (port == 5 && !mt7531_is_rgmii_port(priv, port))) { + if ((port == 5 || port == 6) && + interface == PHY_INTERFACE_MODE_2500BASEX) { phylink_set(supported, 2500baseX_Full); phylink_set(supported, 2500baseT_Full); } @@ -2903,16 +2904,18 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, static void mt7530_mac_port_validate(struct dsa_switch *ds, int port, + phy_interface_t interface, unsigned long *supported) { } static void mt7531_mac_port_validate(struct dsa_switch *ds, int port, + phy_interface_t interface, unsigned long *supported) { struct mt7530_priv *priv = ds->priv; - mt7531_sgmii_validate(priv, port, supported); + mt7531_sgmii_validate(priv, port, interface, supported); } static void @@ -2935,12 +2938,13 @@ mt753x_phylink_validate(struct dsa_switch *ds, int port, } /* This switch only supports 1G full-duplex. */ - if (state->interface != PHY_INTERFACE_MODE_MII) { + if (state->interface != PHY_INTERFACE_MODE_MII && + state->interface != PHY_INTERFACE_MODE_2500BASEX) phylink_set(mask, 1000baseT_Full); phylink_set(mask, 1000baseX_Full); } - priv->info->mac_port_validate(ds, port, mask); + priv->info->mac_port_validate(ds, port, state->interface, mask); phylink_set(mask, Pause); phylink_set(mask, Asym_Pause); diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index cbebbcc76509..73cfd29fbb17 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -772,6 +772,7 @@ struct mt753x_info { void (*mac_port_get_caps)(struct dsa_switch *ds, int port, struct phylink_config *config); void (*mac_port_validate)(struct dsa_switch *ds, int port, + phy_interface_t interface, unsigned long *supported); int (*mac_port_get_state)(struct dsa_switch *ds, int port, struct phylink_link_state *state);
Now that mt7530 is not using the basex helper, it becomes unnecessary to indicate support for both 1000baseX and 2500baseX when one of the 803.3z PHY interface modes is being selected. Ensure that the driver indicates only those linkmodes that can actually be supported by the PHY interface mode. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/dsa/mt7530.c | 14 +++++++++----- drivers/net/dsa/mt7530.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-)