Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b13c3ae authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: Drop legacy MDIO code 



Now that we have fully migrated to the mdio-bcm-unimac driver, drop the
legacy MDIO bus code which did duplicate a fair amount of code.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a4e7969

drivers/net/ethernet/broadcom/genet/bcmmii.c

+0 −125
Original line number Diff line number Diff line
@@ -28,59 +28,6 @@ 


#include "bcmgenet.h"



/* read a value from the MII */

static int bcmgenet_mii_read(struct mii_bus *bus, int phy_id, int location)

{

	int ret;

	struct net_device *dev = bus->priv;

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 reg;



	bcmgenet_umac_writel(priv, (MDIO_RD | (phy_id << MDIO_PMD_SHIFT) |

			     (location << MDIO_REG_SHIFT)), UMAC_MDIO_CMD);

	/* Start MDIO transaction*/

	reg = bcmgenet_umac_readl(priv, UMAC_MDIO_CMD);

	reg |= MDIO_START_BUSY;

	bcmgenet_umac_writel(priv, reg, UMAC_MDIO_CMD);

	wait_event_timeout(priv->wq,

			   !(bcmgenet_umac_readl(priv, UMAC_MDIO_CMD)

			   & MDIO_START_BUSY),

			   HZ / 100);

	ret = bcmgenet_umac_readl(priv, UMAC_MDIO_CMD);



	/* Some broken devices are known not to release the line during

	 * turn-around, e.g: Broadcom BCM53125 external switches, so check for

	 * that condition here and ignore the MDIO controller read failure

	 * indication.

	 */

	if (!(bus->phy_ignore_ta_mask & 1 << phy_id) && (ret & MDIO_READ_FAIL))

		return -EIO;



	return ret & 0xffff;

}



/* write a value to the MII */

static int bcmgenet_mii_write(struct mii_bus *bus, int phy_id,

			      int location, u16 val)

{

	struct net_device *dev = bus->priv;

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 reg;



	bcmgenet_umac_writel(priv, (MDIO_WR | (phy_id << MDIO_PMD_SHIFT) |

			     (location << MDIO_REG_SHIFT) | (0xffff & val)),

			     UMAC_MDIO_CMD);

	reg = bcmgenet_umac_readl(priv, UMAC_MDIO_CMD);

	reg |= MDIO_START_BUSY;

	bcmgenet_umac_writel(priv, reg, UMAC_MDIO_CMD);

	wait_event_timeout(priv->wq,

			   !(bcmgenet_umac_readl(priv, UMAC_MDIO_CMD) &

			   MDIO_START_BUSY),

			   HZ / 100);



	return 0;

}



/* setup netdev link state when PHY link status change and

 * update UMAC and RGMII block when link up

 */
@@ -393,78 +340,6 @@ int bcmgenet_mii_probe(struct net_device *dev) 
	return 0;

}



/* Workaround for integrated BCM7xxx Gigabit PHYs which have a problem with

 * their internal MDIO management controller making them fail to successfully

 * be read from or written to for the first transaction.  We insert a dummy

 * BMSR read here to make sure that phy_get_device() and get_phy_id() can

 * correctly read the PHY MII_PHYSID1/2 registers and successfully register a

 * PHY device for this peripheral.

 *

 * Once the PHY driver is registered, we can workaround subsequent reads from

 * there (e.g: during system-wide power management).

 *

 * bus->reset is invoked before mdiobus_scan during mdiobus_register and is

 * therefore the right location to stick that workaround. Since we do not want

 * to read from non-existing PHYs, we either use bus->phy_mask or do a manual

 * Device Tree scan to limit the search area.

 */

static int bcmgenet_mii_bus_reset(struct mii_bus *bus)

{

	struct net_device *dev = bus->priv;

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct device_node *np = priv->mdio_dn;

	struct device_node *child = NULL;

	u32 read_mask = 0;

	int addr = 0;



	if (!np) {

		read_mask = 1 << priv->phy_addr;

	} else {

		for_each_available_child_of_node(np, child) {

			addr = of_mdio_parse_addr(&dev->dev, child);

			if (addr < 0)

				continue;



			read_mask |= 1 << addr;

		}

	}



	for (addr = 0; addr < PHY_MAX_ADDR; addr++) {

		if (read_mask & 1 << addr) {

			dev_dbg(&dev->dev, "Workaround for PHY @ %d\n", addr);

			mdiobus_read(bus, addr, MII_BMSR);

		}

	}



	return 0;

}



static int bcmgenet_mii_alloc(struct bcmgenet_priv *priv)

{

	struct mii_bus *bus;



	if (priv->mii_bus)

		return 0;



	priv->mii_bus = mdiobus_alloc();

	if (!priv->mii_bus) {

		pr_err("failed to allocate\n");

		return -ENOMEM;

	}



	bus = priv->mii_bus;

	bus->priv = priv->dev;

	bus->name = "bcmgenet MII bus";

	bus->parent = &priv->pdev->dev;

	bus->read = bcmgenet_mii_read;

	bus->write = bcmgenet_mii_write;

	bus->reset = bcmgenet_mii_bus_reset;

	snprintf(bus->id, MII_BUS_ID_SIZE, "%s-%d",

		 priv->pdev->name, priv->pdev->id);



	return 0;

}



static struct device_node *bcmgenet_mii_of_find_mdio(struct bcmgenet_priv *priv)

{

	struct device_node *dn = priv->pdev->dev.of_node;