[U-Boot] [PATCH 1/2] lib: Add WATCHDOG_RESET to wait_bit.h
wait_for_bit() is missing reset watchdog in case watchdog is configured.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
include/wait_bit.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/wait_bit.h b/include/wait_bit.h index 066e30c118af..06ad43a122d6 100644 --- a/include/wait_bit.h +++ b/include/wait_bit.h @@ -11,6 +11,7 @@
#include <common.h> #include <console.h> +#include <watchdog.h> #include <linux/errno.h> #include <asm/io.h>
@@ -59,6 +60,7 @@ static inline int wait_for_bit(const char *prefix, const u32 *reg, }
udelay(1); + WATCHDOG_RESET(); }
debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n", prefix, reg, mask,
Using generic wait_for_bit() implementation instead of using private wait function.
Signed-off-by: Michal Simek michal.simek@xilinx.com ---
drivers/net/zynq_gem.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index d2e5e7c7cd14..95b4d6e4f0aa 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -183,33 +183,17 @@ struct zynq_gem_priv { struct mii_dev *bus; };
-static inline int mdio_wait(struct zynq_gem_regs *regs) -{ - u32 timeout = 20000; - - /* Wait till MDIO interface is ready to accept a new transaction. */ - while (--timeout) { - if (readl(®s->nwsr) & ZYNQ_GEM_NWSR_MDIOIDLE_MASK) - break; - WATCHDOG_RESET(); - } - - if (!timeout) { - printf("%s: Timeout\n", __func__); - return 1; - } - - return 0; -} - static u32 phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, u32 op, u16 *data) { u32 mgtcr; struct zynq_gem_regs *regs = priv->iobase; + int err;
- if (mdio_wait(regs)) - return 1; + err = wait_for_bit(__func__, ®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, + true, 20000, true); + if (err) + return err;
/* Construct mgtcr mask for the operation */ mgtcr = ZYNQ_GEM_PHYMNTNC_OP_MASK | op | @@ -219,8 +203,10 @@ static u32 phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum, /* Write mgtcr and wait for completion */ writel(mgtcr, ®s->phymntnc);
- if (mdio_wait(regs)) - return 1; + err = wait_for_bit(__func__, ®s->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK, + true, 20000, true); + if (err) + return err;
if (op == ZYNQ_GEM_PHYMNTNC_OP_R_MASK) *data = readl(®s->phymntnc);
On Mon, Dec 12, 2016 at 2:58 AM, Michal Simek michal.simek@xilinx.com wrote:
Using generic wait_for_bit() implementation instead of using private wait function.
Signed-off-by: Michal Simek michal.simek@xilinx.com
Acked-by: Joe Hershberger joe.hershberger@ni.com
On Mon, Dec 12, 2016 at 09:58:23AM +0100, Michal Simek wrote:
wait_for_bit() is missing reset watchdog in case watchdog is configured.
Signed-off-by: Michal Simek michal.simek@xilinx.com
Reviewed-by: Tom Rini trini@konsulko.com
participants (3)
-
Joe Hershberger -
Michal Simek -
Tom Rini