[PATCH] net: designware: eqos: don't funnel all MDIO writes to register 0

[PATCH] net: designware: eqos: don't funnel all MDIO writes to register 0

[Ahmad Fatoum]

eqos_mdio_write ended up using the addr parameter instead of the
computed miiaddr variable, which would've factored in the reg parameter.

This had the effect that all writes went to PHY register 0, which was
fine as long as there were only register 0 writes. As soon there are more
writes, e.g. because a PHY driver was enabled, register 0 became
clobbered and erratic behavior ensued.
Fix the typo and while at it rename the val parameter to a more
descriptive name.

Fixes: a4f709bbb ("net: add Designware Ethernet QoS for STM32MP")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
Could this be applied to master? Thanks.
---
 drivers/net/designware_eqos.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index da67adf9a0f0..4ae07fe059ca 100644
--- a/drivers/net/designware_eqos.c
+++ b/drivers/net/designware_eqos.c
@@ -229,7 +229,7 @@ static int eqos_mdio_read(struct mii_bus *bus, int addr, int reg)
 	return readl(&eqos->mac_regs->mdio_data) & 0xffff;
 }
 
-static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
+static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 data)
 {
 	struct eqos *eqos = bus->priv;
 	u32 miiaddr = 0;
@@ -249,8 +249,8 @@ static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
 	miiaddr |= EQOS_MDIO_ADDR(addr) | EQOS_MDIO_REG(reg);
 	miiaddr |= MII_BUSY;
 
-	writel(val, &eqos->mac_regs->mdio_data);
-	writel(addr, &eqos->mac_regs->mdio_address);
+	writel(data, &eqos->mac_regs->mdio_data);
+	writel(miiaddr, &eqos->mac_regs->mdio_address);
 
 	udelay(eqos->ops->mdio_wait_us);
 
-- 
2.25.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] net: designware: eqos: don't funnel all MDIO writes to register 0

[Sascha Hauer]

On Fri, Jan 17, 2020 at 07:17:16PM +0100, Ahmad Fatoum wrote:
> eqos_mdio_write ended up using the addr parameter instead of the
> computed miiaddr variable, which would've factored in the reg parameter.
> 
> This had the effect that all writes went to PHY register 0, which was
> fine as long as there were only register 0 writes. As soon there are more
> writes, e.g. because a PHY driver was enabled, register 0 became
> clobbered and erratic behavior ensued.
> Fix the typo and while at it rename the val parameter to a more
> descriptive name.
> 
> Fixes: a4f709bbb ("net: add Designware Ethernet QoS for STM32MP")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> Could this be applied to master? Thanks.

Did that.

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox