diff mbox series

[net-next,2/2] net: dsa: mv88e6xxx: Set link down when changing speed

Message ID 20200323214900.14083-3-andrew@lunn.ch
State New
Headers show
Series None | expand

Commit Message

Andrew Lunn March 23, 2020, 9:49 p.m. UTC 
The MAC control register must not be changed unless the link is down.
Add the necassary call into mv88e6xxx_mac_link_up. Without it, the MAC
does not change state, the link remains at the wrong speed.

Fixes: 30c4a5b0aad8 ("net: mv88e6xxx: use resolved link config in mac_link_up()")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++++++
 1 file changed, 8 insertions(+)
diff mbox series

Patch

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index dd8a5666a584..24ce17503950 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -733,6 +733,14 @@  static void mv88e6xxx_mac_link_up(struct dsa_switch *ds, int port,
 
 	mv88e6xxx_reg_lock(chip);
 	if (!mv88e6xxx_port_ppu_updates(chip, port) || mode == MLO_AN_FIXED) {
+		/* Port's MAC control must not be changed unless the
+		 * link is down
+		 */
+		err = chip->info->ops->port_set_link(chip, port,
+						     LINK_FORCED_DOWN);
+		if (err)
+			goto error;
+
 		/* FIXME: for an automedia port, should we force the link
 		 * down here - what if the link comes up due to "other" media
 		 * while we're bringing the port up, how is the exclusivity