Commit 6e899e6c authored Oct 22, 2015 by Neil Armstrong Committed by David S. Miller Oct 23, 2015

net: dsa: Make mv88e6xxx use nested mdiobus read/write



Make the mv88e6xxx driver use the previously introduced nested
variants of mdiobus_read/write functions.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 21dd19fe

drivers/net/dsa/mv88e6xxx.c

+9 −37

Original line number	Diff line number	Diff line
		@@ -24,34 +24,6 @@
		#include <net/switchdev.h>
		#include "mv88e6xxx.h"

		/* MDIO bus access can be nested in the case of PHYs connected to the
		* internal MDIO bus of the switch, which is accessed via MDIO bus of
		* the Ethernet interface. Avoid lockdep false positives by using
		* mutex_lock_nested().
		*/
		static int mv88e6xxx_mdiobus_read(struct mii_bus *bus, int addr, u32 regnum)
		{
		int ret;

		mutex_lock_nested(&bus->mdio_lock, SINGLE_DEPTH_NESTING);
		ret = bus->read(bus, addr, regnum);
		mutex_unlock(&bus->mdio_lock);

		return ret;
		}

		static int mv88e6xxx_mdiobus_write(struct mii_bus *bus, int addr, u32 regnum,
		u16 val)
		{
		int ret;

		mutex_lock_nested(&bus->mdio_lock, SINGLE_DEPTH_NESTING);
		ret = bus->write(bus, addr, regnum, val);
		mutex_unlock(&bus->mdio_lock);

		return ret;
		}

		/* If the switch's ADDR[4:0] strap pins are strapped to zero, it will
		* use all 32 SMI bus addresses on its SMI bus, and all switch registers
		* will be directly accessible on some {device address,register address}
		@@ -66,7 +38,7 @@ static int mv88e6xxx_reg_wait_ready(struct mii_bus *bus, int sw_addr)
		int i;

		for (i = 0; i < 16; i++) {
		ret = mv88e6xxx_mdiobus_read(bus, sw_addr, SMI_CMD);
		ret = mdiobus_read_nested(bus, sw_addr, SMI_CMD);
		if (ret < 0)
		return ret;

		@@ -82,7 +54,7 @@ int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg)
		int ret;

		if (sw_addr == 0)
		return mv88e6xxx_mdiobus_read(bus, addr, reg);
		return mdiobus_read_nested(bus, addr, reg);

		/* Wait for the bus to become free. */
		ret = mv88e6xxx_reg_wait_ready(bus, sw_addr);
		@@ -90,7 +62,7 @@ int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg)
		return ret;

		/* Transmit the read command. */
		ret = mv88e6xxx_mdiobus_write(bus, sw_addr, SMI_CMD,
		ret = mdiobus_write_nested(bus, sw_addr, SMI_CMD,
		SMI_CMD_OP_22_READ \| (addr << 5) \| reg);
		if (ret < 0)
		return ret;
		@@ -101,7 +73,7 @@ int __mv88e6xxx_reg_read(struct mii_bus *bus, int sw_addr, int addr, int reg)
		return ret;

		/* Read the data. */
		ret = mv88e6xxx_mdiobus_read(bus, sw_addr, SMI_DATA);
		ret = mdiobus_read_nested(bus, sw_addr, SMI_DATA);
		if (ret < 0)
		return ret;

		@@ -145,7 +117,7 @@ int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,
		int ret;

		if (sw_addr == 0)
		return mv88e6xxx_mdiobus_write(bus, addr, reg, val);
		return mdiobus_write_nested(bus, addr, reg, val);

		/* Wait for the bus to become free. */
		ret = mv88e6xxx_reg_wait_ready(bus, sw_addr);
		@@ -153,12 +125,12 @@ int __mv88e6xxx_reg_write(struct mii_bus *bus, int sw_addr, int addr,
		return ret;

		/* Transmit the data to write. */
		ret = mv88e6xxx_mdiobus_write(bus, sw_addr, SMI_DATA, val);
		ret = mdiobus_write_nested(bus, sw_addr, SMI_DATA, val);
		if (ret < 0)
		return ret;

		/* Transmit the write command. */
		ret = mv88e6xxx_mdiobus_write(bus, sw_addr, SMI_CMD,
		ret = mdiobus_write_nested(bus, sw_addr, SMI_CMD,
		SMI_CMD_OP_22_WRITE \| (addr << 5) \| reg);
		if (ret < 0)
		return ret;