aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>2017-05-30 14:28:39 +0200
committerJoe Hershberger <joe.hershberger@ni.com>2017-06-02 14:44:20 -0500
commitdea004e41a6d1aa8ebf668c450962db45a41b373 (patch)
tree608238a8121381a26650fdd239229d019644bbf4
parent68e6ecadc551250a73ff28e970440955f3e46ac2 (diff)
downloadu-boot-dea004e41a6d1aa8ebf668c450962db45a41b373.zip
u-boot-dea004e41a6d1aa8ebf668c450962db45a41b373.tar.gz
u-boot-dea004e41a6d1aa8ebf668c450962db45a41b373.tar.bz2
net: zynq_gem: Use wait_for_bit with non breakable
Use wait_for_bit to be non breakable as using it with breakable causes issue of un interruptible auto negotiation. This is due to the ctrlc pressed will taken for wait_for_bit() abort during phy_read() and hence not coming out of auto negotiation. Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--drivers/net/zynq_gem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index f3d6727..d3919be 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -192,7 +192,7 @@ static u32 phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
int err;
err = wait_for_bit(__func__, &regs->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK,
- true, 20000, true);
+ true, 20000, false);
if (err)
return err;
@@ -205,7 +205,7 @@ static u32 phy_setup_op(struct zynq_gem_priv *priv, u32 phy_addr, u32 regnum,
writel(mgtcr, &regs->phymntnc);
err = wait_for_bit(__func__, &regs->nwsr, ZYNQ_GEM_NWSR_MDIOIDLE_MASK,
- true, 20000, true);
+ true, 20000, false);
if (err)
return err;