mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-24 05:04:00 +08:00
2/2] net: xilinx_emaclite: use readx_poll_timeout() in mdio wait function
On loaded systems with a preemptible kernel the mdio_wait() function may report an error while everything is working fine: xemaclite_mdio_wait(): xemaclite_readl() -> chip not ready --> interrupt here (other work for some time / chip become ready) if (time_before_eq(end, jiffies)) --> false positive error report Replace the current code with readx_poll_timeout() which takes care of the situation. Signed-off-by: Kurt Kanzenbach <kurt@linutronix.de> Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
882119ff96
commit
563ecb8a3c
@ -27,6 +27,7 @@
|
||||
#include <linux/of_net.h>
|
||||
#include <linux/phy.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/iopoll.h>
|
||||
|
||||
#define DRIVER_NAME "xilinx_emaclite"
|
||||
|
||||
@ -714,20 +715,15 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
|
||||
|
||||
static int xemaclite_mdio_wait(struct net_local *lp)
|
||||
{
|
||||
unsigned long end = jiffies + 2;
|
||||
u32 val;
|
||||
|
||||
/* wait for the MDIO interface to not be busy or timeout
|
||||
* after some time.
|
||||
*/
|
||||
while (xemaclite_readl(lp->base_addr + XEL_MDIOCTRL_OFFSET) &
|
||||
XEL_MDIOCTRL_MDIOSTS_MASK) {
|
||||
if (time_before_eq(end, jiffies)) {
|
||||
WARN_ON(1);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
msleep(1);
|
||||
}
|
||||
return 0;
|
||||
return readx_poll_timeout(xemaclite_readl,
|
||||
lp->base_addr + XEL_MDIOCTRL_OFFSET,
|
||||
val, !(val & XEL_MDIOCTRL_MDIOSTS_MASK),
|
||||
1000, 20000);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user