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

FEC: Remove endless loop in the FEC driver

Browse Source 
The FEC hardware sometimes errors out on data transfer and hangs in
the tightloop adjusted by this patch. So add timeout into the tightloop
to make such a hang recoverable.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Marek Vasut 2012-08-29 03:49:49 +00:00 committed by Joe Hershberger
parent efe24d2e17
commit bc1ce150b9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/fec_mxc.c
View File

@ -35,6 +35,12 @@
DECLARE_GLOBAL_DATA_PTR;
/*
* Timeout the transfer after 5 mS. This is usually a bit more, since
* the code in the tightloops this timeout is used in adds some overhead.
*/
#define FEC_XFER_TIMEOUT 5000
#ifndef CONFIG_MII
#error "CONFIG_MII has to be defined!"
#endif
@ -697,6 +703,8 @@ static int fec_send(struct eth_device *dev, void *packet, int length)
unsigned int status;
uint32_t size, end;
uint32_t addr;
int timeout = FEC_XFER_TIMEOUT;
int ret = 0;
/*
* This routine transmits one frame. This routine only accepts
@ -764,6 +772,10 @@ static int fec_send(struct eth_device *dev, void *packet, int length)
while (readw(&fec->tbd_base[fec->tbd_index].status) & FEC_TBD_READY) {
udelay(1);
invalidate_dcache_range(addr, addr + size);
if (!timeout--) {
ret = -EINVAL;
break;
}
}
debug("fec_send: status 0x%x index %d\n",
@ -775,7 +787,7 @@ static int fec_send(struct eth_device *dev, void *packet, int length)
else
fec->tbd_index = 1;
return 0;
return ret;
}
/**