net: mdio: mdio-bitbang: Fix C45 read/write protocol

[ Upstream commit 2572ce62415cf3b632391091447252e2661ed520 ]

Based on the original code semantic in case of Clause 45 MDIO, the address
command is supposed to be followed by the command sending the MMD address,
not the CSR address. The commit 002dd3de097c ("net: mdio: mdio-bitbang:
Separate C22 and C45 transactions") has erroneously broken that. So most
likely due to an unfortunate variable name it switched the code to sending
the CSR address. In our case it caused the protocol malfunction so the
read operation always failed with the turnaround bit always been driven to
one by PHY instead of zero. Fix that by getting back the correct
behaviour: sending MMD address command right after the regular address
command.

Fixes: 002dd3de097c ("net: mdio: mdio-bitbang: Separate C22 and C45 transactions")
Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/mdio/mdio-bitbang.c b/drivers/net/mdio/mdio-bitbang.c
index b83932562be2157dbbe1512a816b5fa60ee4eff7..81b7748c10ce0e0d74ab3f314a21aa34e9a13c0a 100644 (file)
--- a/drivers/net/mdio/mdio-bitbang.c
+++ b/drivers/net/mdio/mdio-bitbang.c
@@ -186,7 +186,7 @@ int mdiobb_read_c45(struct mii_bus *bus, int phy, int devad, int reg)
        struct mdiobb_ctrl *ctrl = bus->priv;
 
        mdiobb_cmd_addr(ctrl, phy, devad, reg);
-       mdiobb_cmd(ctrl, MDIO_C45_READ, phy, reg);
+       mdiobb_cmd(ctrl, MDIO_C45_READ, phy, devad);
 
        return mdiobb_read_common(bus, phy);
 }
@@ -222,7 +222,7 @@ int mdiobb_write_c45(struct mii_bus *bus, int phy, int devad, int reg, u16 val)
        struct mdiobb_ctrl *ctrl = bus->priv;
 
        mdiobb_cmd_addr(ctrl, phy, devad, reg);
-       mdiobb_cmd(ctrl, MDIO_C45_WRITE, phy, reg);
+       mdiobb_cmd(ctrl, MDIO_C45_WRITE, phy, devad);
 
        return mdiobb_write_common(bus, val);
 }