| Message ID | 20220425070454.348584-1-nathan@nathanrossi.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 24cbdb910bb62b5be3865275e5682be1a7708c0f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v3] net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr | expand |
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Mon, 25 Apr 2022 07:04:54 +0000 you wrote: > 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). > > [...] Here is the summary with links: - [v3] net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr https://git.kernel.org/netdev/net/c/24cbdb910bb6 You are awesome, thank you!
diff --git a/drivers/net/dsa/mv88e6xxx/port_hidden.c b/drivers/net/dsa/mv88e6xxx/port_hidden.c index b49d05f0e1..7a9f9ff6de 100644 --- a/drivers/net/dsa/mv88e6xxx/port_hidden.c +++ b/drivers/net/dsa/mv88e6xxx/port_hidden.c @@ -40,8 +40,9 @@ 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, - MV88E6XXX_PORT_RESERVED_1A, bit, 0); + return mv88e6xxx_port_wait_bit(chip, + MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT, + MV88E6XXX_PORT_RESERVED_1A, bit, 0); } int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int port,
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: 609070133aff ("net: dsa: mv88e6xxx: update code operating on hidden registers") Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Reviewed-by: Marek Behún <kabel@kernel.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch> --- Changes in v2: - Add Fixes Changes in v3: - Changed Fixes to more recent commit where the bug is present --- drivers/net/dsa/mv88e6xxx/port_hidden.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- 2.35.2