Commit 24cbdb91 authored by Nathan Rossi's avatar Nathan Rossi Committed by Paolo Abeni
Browse files

net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr 



The other port_hidden functions rely on the port_read/port_write
functions to access the hidden control port. These functions apply the
offset for port_base_addr where applicable. Update port_hidden_wait to
use the port_wait_bit so that port_base_addr offsets are accounted for
when waiting for the busy bit to change.

Without the offset the port_hidden_wait function would timeout on
devices that have a non-zero port_base_addr (e.g. MV88E6141), however
devices that have a zero port_base_addr would operate correctly (e.g.
MV88E6390).

Fixes: 60907013 ("net: dsa: mv88e6xxx: update code operating on hidden registers")
Signed-off-by: default avatarNathan Rossi <nathan@nathanrossi.com>
Reviewed-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220425070454.348584-1-nathan@nathanrossi.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 0ed9704b

drivers/net/dsa/mv88e6xxx/port_hidden.c

+3 −2
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip) 
{

	int bit = __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY);



	return mv88e6xxx_wait_bit(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,

	return mv88e6xxx_port_wait_bit(chip,

				       MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,

				       MV88E6XXX_PORT_RESERVED_1A, bit, 0);

}