From mboxrd@z Thu Jan 1 00:00:00 1970 From: Giuseppe CAVALLARO Subject: Re: [PATCH 07/17] net: stmmac: replace stmmac_mdio_busy_wait by readl_poll_timeout Date: Tue, 31 Jan 2017 11:13:49 +0100 Message-ID: <299b8e9a-00fe-173e-a125-5e7e27f123d1@st.com> References: <20170131091152.13842-1-clabbe.montjoie@gmail.com> <20170131091152.13842-8-clabbe.montjoie@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Cc: , To: Corentin Labbe , , Return-path: Received: from mx08-00178001.pphosted.com ([91.207.212.93]:40868 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751430AbdAaKoq (ORCPT ); Tue, 31 Jan 2017 05:44:46 -0500 In-Reply-To: <20170131091152.13842-8-clabbe.montjoie@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On 1/31/2017 10:11 AM, Corentin Labbe wrote: > The stmmac_mdio_busy_wait() function do the same job than > readl_poll_timeout(). > So is is better to replace it. > > Signed-off-by: Corentin Labbe I just wonder if you also tested it, this impacts all the platforms where SMA block is used if yes, pls consider my: Acked-by: Giuseppe Cavallaro > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 33 ++++++++--------------- > 1 file changed, 11 insertions(+), 22 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > index c24bef2..d9893cf 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > @@ -21,6 +21,7 @@ > *******************************************************************************/ > > #include > +#include > #include > #include > #include > @@ -38,22 +39,6 @@ > #define MII_GMAC4_WRITE (1 << MII_GMAC4_GOC_SHIFT) > #define MII_GMAC4_READ (3 << MII_GMAC4_GOC_SHIFT) > > -static int stmmac_mdio_busy_wait(void __iomem *ioaddr, unsigned int mii_addr) > -{ > - unsigned long curr; > - unsigned long finish = jiffies + 3 * HZ; > - > - do { > - curr = jiffies; > - if (readl(ioaddr + mii_addr) & MII_BUSY) > - cpu_relax(); > - else > - return 0; > - } while (!time_after_eq(curr, finish)); > - > - return -EBUSY; > -} > - > /** > * stmmac_mdio_read > * @bus: points to the mii_bus structure > @@ -70,7 +55,7 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg) > struct stmmac_priv *priv = netdev_priv(ndev); > unsigned int mii_address = priv->hw->mii.addr; > unsigned int mii_data = priv->hw->mii.data; > - > + u32 v; > int data; > u32 value = MII_BUSY; > > @@ -82,12 +67,14 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg) > if (priv->plat->has_gmac4) > value |= MII_GMAC4_READ; > > - if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address)) > + if (readl_poll_timeout(priv->ioaddr + mii_address, v, !(v & MII_BUSY), > + 100, 10000)) > return -EBUSY; > > writel(value, priv->ioaddr + mii_address); > > - if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address)) > + if (readl_poll_timeout(priv->ioaddr + mii_address, v, !(v & MII_BUSY), > + 100, 10000)) > return -EBUSY; > > /* Read the data from the MII data register */ > @@ -111,7 +98,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, > struct stmmac_priv *priv = netdev_priv(ndev); > unsigned int mii_address = priv->hw->mii.addr; > unsigned int mii_data = priv->hw->mii.data; > - > + u32 v; > u32 value = MII_BUSY; > > value |= (phyaddr << priv->hw->mii.addr_shift) > @@ -126,7 +113,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, > value |= MII_WRITE; > > /* Wait until any existing MII operation is complete */ > - if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address)) > + if (readl_poll_timeout(priv->ioaddr + mii_address, v, !(v & MII_BUSY), > + 100, 10000)) > return -EBUSY; > > /* Set the MII address register to write */ > @@ -134,7 +122,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, > writel(value, priv->ioaddr + mii_address); > > /* Wait until any existing MII operation is complete */ > - return stmmac_mdio_busy_wait(priv->ioaddr, mii_address); > + return readl_poll_timeout(priv->ioaddr + mii_address, v, !(v & MII_BUSY), > + 100, 10000); > } > > /** >