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

Commit 69a60b05 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: mdio-bcm-unimac: factor busy polling loop 



Factor the code that does the busy polling on the MDIO_BUSY bit since we
will have different code-paths for for completion depending on whether
we are using interrupts or polling.

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

drivers/net/phy/mdio-bcm-unimac.c

+21 −22
Original line number Original line Diff line number Diff line
@@ -57,10 +57,26 @@ static inline unsigned int unimac_mdio_busy(struct unimac_mdio_priv *priv) 
	return __raw_readl(priv->base + MDIO_CMD) & MDIO_START_BUSY;

	return __raw_readl(priv->base + MDIO_CMD) & MDIO_START_BUSY;

}

}





static int unimac_mdio_poll(struct unimac_mdio_priv *priv)

{

	unsigned int timeout = 1000;



	do {

		if (!unimac_mdio_busy(priv))

			return 0;



		usleep_range(1000, 2000);

	} while (timeout--);



	if (!timeout)

		return -ETIMEDOUT;



	return 0;

}



static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg)

static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg)

{

{

	struct unimac_mdio_priv *priv = bus->priv;

	struct unimac_mdio_priv *priv = bus->priv;

	unsigned int timeout = 1000;

	u32 cmd;

	u32 cmd;





	/* Prepare the read operation */

	/* Prepare the read operation */
@@ -70,15 +86,9 @@ static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg) 
	/* Start MDIO transaction */

	/* Start MDIO transaction */

	unimac_mdio_start(priv);

	unimac_mdio_start(priv);





	do {

	ret = unimac_mdio_poll(priv);

		if (!unimac_mdio_busy(priv))

	if (ret)

			break;

		return ret;



		usleep_range(1000, 2000);

	} while (timeout--);



	if (!timeout)

		return -ETIMEDOUT;





	cmd = __raw_readl(priv->base + MDIO_CMD);

	cmd = __raw_readl(priv->base + MDIO_CMD);
@@ -97,7 +107,6 @@ static int unimac_mdio_write(struct mii_bus *bus, int phy_id, 
			     int reg, u16 val)

			     int reg, u16 val)

{

{

	struct unimac_mdio_priv *priv = bus->priv;

	struct unimac_mdio_priv *priv = bus->priv;

	unsigned int timeout = 1000;

	u32 cmd;

	u32 cmd;





	/* Prepare the write operation */

	/* Prepare the write operation */
@@ -107,17 +116,7 @@ static int unimac_mdio_write(struct mii_bus *bus, int phy_id, 




	unimac_mdio_start(priv);

	unimac_mdio_start(priv);





	do {

	return unimac_mdio_poll(priv);

		if (!unimac_mdio_busy(priv))

			break;



		usleep_range(1000, 2000);

	} while (timeout--);



	if (!timeout)

		return -ETIMEDOUT;



	return 0;

}

}





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

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