Skip to content

Commit 24cbdb9

Browse files
nathanrossiPaolo Abeni
authored andcommitted
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: 6090701 ("net: dsa: mv88e6xxx: update code operating on hidden registers") Signed-off-by: Nathan Rossi <[email protected]> Reviewed-by: Marek Behún <[email protected]> Reviewed-by: Andrew Lunn <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent 0ed9704 commit 24cbdb9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/net/dsa/mv88e6xxx/port_hidden.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chip)
4040
{
4141
int bit = __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY);
4242

43-
return mv88e6xxx_wait_bit(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,
44-
MV88E6XXX_PORT_RESERVED_1A, bit, 0);
43+
return mv88e6xxx_port_wait_bit(chip,
44+
MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT,
45+
MV88E6XXX_PORT_RESERVED_1A, bit, 0);
4546
}
4647

4748
int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int port,

0 commit comments

Comments
 (0)