AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-05 21:45:11 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: dsa: sja1105: move MAC configuration to .phylink_mac_link_up

Browse Source 
The switches supported so far by the driver only have non-SerDes ports,
so they should be configured in the PHYLINK callback that provides the
resolved PHY link parameters.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2020-03-12 12:19:51 +00:00 committed by David S. Miller
parent 724d021566
commit ec8582d134
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/dsa/sja1105/sja1105_main.c
View File

@ -765,15 +765,16 @@ static void sja1105_mac_config(struct dsa_switch *ds, int port,
{ {
struct sja1105_private *priv = ds->priv; struct sja1105_private *priv = ds->priv;
if (sja1105_phy_mode_mismatch(priv, port, state->interface)) if (sja1105_phy_mode_mismatch(priv, port, state->interface)) {
dev_err(ds->dev, "Changing PHY mode to %s not supported!\n",
phy_modes(state->interface));
return; return;
}
if (link_an_mode == MLO_AN_INBAND) { if (link_an_mode == MLO_AN_INBAND) {
dev_err(ds->dev, "In-band AN not supported!\n"); dev_err(ds->dev, "In-band AN not supported!\n");
return; return;
} }
sja1105_adjust_port_config(priv, port, state->speed);
} }
static void sja1105_mac_link_down(struct dsa_switch *ds, int port, static void sja1105_mac_link_down(struct dsa_switch *ds, int port,
@ -790,7 +791,11 @@ static void sja1105_mac_link_up(struct dsa_switch *ds, int port,
int speed, int duplex, int speed, int duplex,
bool tx_pause, bool rx_pause) bool tx_pause, bool rx_pause)
{ {
sja1105_inhibit_tx(ds->priv, BIT(port), false); struct sja1105_private *priv = ds->priv;
sja1105_adjust_port_config(priv, port, speed);
sja1105_inhibit_tx(priv, BIT(port), false);
} }
static void sja1105_phylink_validate(struct dsa_switch *ds, int port, static void sja1105_phylink_validate(struct dsa_switch *ds, int port,