Message ID | 1b73aa57b77587391e1bcd6d9f0480163367ed1b.1637237121.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Commit | 2a9caba1ceff85c7c07dcb43d48b4c8cf8c79f5e |
Delegated to: | Michal Simek |
Headers | show |
Series | net: gem: Reduce timeout of mdio phy idle status check | expand |
On Thu, Nov 18, 2021 at 2:05 PM Michal Simek <michal.simek@xilinx.com> wrote: > > From: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> > > Timeout for checking mdio phy idle status is 20seconds. In case of errors > this timeout will be too much. Reduce it to 100ms. > > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > drivers/net/zynq_gem.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c > index c309c3c95499..033021f1cbfc 100644 > --- a/drivers/net/zynq_gem.c > +++ b/drivers/net/zynq_gem.c > @@ -110,6 +110,8 @@ > > #define ZYNQ_GEM_DCFG_DBG6_DMA_64B BIT(23) > > +#define MDIO_IDLE_TIMEOUT_MS 100 > + > /* Use MII register 1 (MII status register) to detect PHY */ > #define PHY_DETECT_REG 1 > > @@ -225,7 +227,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, > int err; > > err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, > - true, 20000, false); > + true, MDIO_IDLE_TIMEOUT_MS, false); > if (err) > return err; > > @@ -238,7 +240,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, > writel(mgtcr, ®s->phymntnc); > > err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, > - true, 20000, false); > + true, MDIO_IDLE_TIMEOUT_MS, false); > if (err) > return err; > > -- > 2.33.1 > Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
čt 18. 11. 2021 v 13:05 odesílatel Michal Simek <michal.simek@xilinx.com> napsal: > > From: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> > > Timeout for checking mdio phy idle status is 20seconds. In case of errors > this timeout will be too much. Reduce it to 100ms. > > Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > drivers/net/zynq_gem.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c > index c309c3c95499..033021f1cbfc 100644 > --- a/drivers/net/zynq_gem.c > +++ b/drivers/net/zynq_gem.c > @@ -110,6 +110,8 @@ > > #define ZYNQ_GEM_DCFG_DBG6_DMA_64B BIT(23) > > +#define MDIO_IDLE_TIMEOUT_MS 100 > + > /* Use MII register 1 (MII status register) to detect PHY */ > #define PHY_DETECT_REG 1 > > @@ -225,7 +227,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, > int err; > > err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, > - true, 20000, false); > + true, MDIO_IDLE_TIMEOUT_MS, false); > if (err) > return err; > > @@ -238,7 +240,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, > writel(mgtcr, ®s->phymntnc); > > err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, > - true, 20000, false); > + true, MDIO_IDLE_TIMEOUT_MS, false); > if (err) > return err; > > -- > 2.33.1 > Applied. M
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index c309c3c95499..033021f1cbfc 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -110,6 +110,8 @@ #define ZYNQ_GEM_DCFG_DBG6_DMA_64B BIT(23) +#define MDIO_IDLE_TIMEOUT_MS 100 + /* Use MII register 1 (MII status register) to detect PHY */ #define PHY_DETECT_REG 1 @@ -225,7 +227,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, int err; err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, - true, 20000, false); + true, MDIO_IDLE_TIMEOUT_MS, false); if (err) return err; @@ -238,7 +240,7 @@ static int phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, writel(mgtcr, ®s->phymntnc); err = wait_for_bit_le32(®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, - true, 20000, false); + true, MDIO_IDLE_TIMEOUT_MS, false); if (err) return err;