Commit b98f0f53 authored Aug 28, 2019 by Vivien Didelot Committed by David S. Miller Aug 29, 2019

net: dsa: mv88e6xxx: get serdes lane after lock



This is a follow-up patch for commit 17deaf5c ("net: dsa:
mv88e6xxx: create serdes_get_lane chip operation").

The .serdes_get_lane implementations access the CMODE of a port,
even though it is cached at the moment, it is safer to call them
after the mutex is locked, not before.

At the same time, check for an eventual error and return IRQ_DONE,
instead of blindly ignoring it.

Signed-off-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 73a1dd8c

drivers/net/dsa/mv88e6xxx/serdes.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -646,10 +646,12 @@ static irqreturn_t mv88e6390_serdes_thread_fn(int irq, void *dev_id)
		int err;
		u8 lane;

		mv88e6xxx_serdes_get_lane(chip, port->port, &lane);

		mv88e6xxx_reg_lock(chip);

		err = mv88e6xxx_serdes_get_lane(chip, port->port, &lane);
		if (err)
		goto out;

		switch (cmode) {
		case MV88E6XXX_PORT_STS_CMODE_SGMII:
		case MV88E6XXX_PORT_STS_CMODE_1000BASEX:

Admin message