leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: zynq_gem: Use shared wait_for_bit

Browse Source 
Use existing library function to poll bit(s).
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
This commit is contained in:
Mateusz Kulikowski 2016-01-23 11:54:33 +01:00 committed by Tom Rini
parent 8c25c2592e
commit e7138b34b0
1 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/zynq_gem.c
View File

@ -19,6 +19,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <phy.h> #include <phy.h>
#include <miiphy.h> #include <miiphy.h>
#include <wait_bit.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
@ -448,38 +449,6 @@ static int zynq_gem_init(struct udevice *dev)
return 0; return 0;
} }
static int wait_for_bit(const char *func, u32 *reg, const u32 mask,
bool set, unsigned int timeout)
{
u32 val;
unsigned long start = get_timer(0);
while (1) {
val = readl(reg);
if (!set)
val = ~val;
if ((val & mask) == mask)
return 0;
if (get_timer(start) > timeout)
break;
if (ctrlc()) {
puts("Abort\n");
return -EINTR;
}
udelay(1);
}
debug("%s: Timeout (reg=%p mask=%08x wait_set=%i)\n",
func, reg, mask, set);
return -ETIMEDOUT;
}
static int zynq_gem_send(struct udevice *dev, void *ptr, int len) static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
{ {
u32 addr, size; u32 addr, size;
@ -521,7 +490,7 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len)
printf("TX buffers exhausted in mid frame\n"); printf("TX buffers exhausted in mid frame\n");
return wait_for_bit(__func__, &regs->txsr, ZYNQ_GEM_TSR_DONE, return wait_for_bit(__func__, &regs->txsr, ZYNQ_GEM_TSR_DONE,
true, 20000); true, 20000, true);
} }
/* Do not check frame_recd flag in rx_status register 0x20 - just poll BD */ /* Do not check frame_recd flag in rx_status register 0x20 - just poll BD */