minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

drivers/net/rtl8139.c: Fix tx timeout

Browse Source 
"to = (currticks() + RTL_TIMEOUT)" has possibilities to wrap around. If it
does, the condition "(currticks() < to)" becomes invalid and immediately
leads to tx timeout error. This patch introduces the fine-graded udely(10)
loops to ease the impact of wrapping around.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Cc: Masami Komiya <mkomiya@sonare.it>
Cc: Lucas Jin <lucasjin@gmail.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Shinya Kuribayashi 2008-01-16 16:11:14 +09:00 committed by Ben Warren
parent 18ee320ff6
commit d1276c76c1
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/rtl8139.c
View File

@ -80,10 +80,7 @@
#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ #if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
defined(CONFIG_RTL8139) defined(CONFIG_RTL8139)
#define TICKS_PER_SEC CFG_HZ #define RTL_TIMEOUT 100000
#define TICKS_PER_MS (TICKS_PER_SEC/1000)
#define RTL_TIMEOUT (1*TICKS_PER_SEC)
#define ETH_FRAME_LEN 1514 #define ETH_FRAME_LEN 1514
#define ETH_ALEN 6 #define ETH_ALEN 6
@ -414,9 +411,10 @@ static void rtl_reset(struct eth_device *dev)
static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length) static int rtl_transmit(struct eth_device *dev, volatile void *packet, int length)
{ {
unsigned int status, to; unsigned int status;
unsigned long txstatus; unsigned long txstatus;
unsigned int len = length; unsigned int len = length;
int i = 0;
ioaddr = dev->iobase; ioaddr = dev->iobase;
@ -436,8 +434,6 @@ static int rtl_transmit(struct eth_device *dev, volatile void *packet, int lengt
outl(((TX_FIFO_THRESH<<11) & 0x003f0000) | len, outl(((TX_FIFO_THRESH<<11) & 0x003f0000) | len,
ioaddr + TxStatus0 + cur_tx*4); ioaddr + TxStatus0 + cur_tx*4);
to = currticks() + RTL_TIMEOUT;
do { do {
status = inw(ioaddr + IntrStatus); status = inw(ioaddr + IntrStatus);
/* Only acknlowledge interrupt sources we can properly handle /* Only acknlowledge interrupt sources we can properly handle
@ -445,7 +441,8 @@ static int rtl_transmit(struct eth_device *dev, volatile void *packet, int lengt
* rtl_poll() function. */ * rtl_poll() function. */
outw(status & (TxOK | TxErr | PCIErr), ioaddr + IntrStatus); outw(status & (TxOK | TxErr | PCIErr), ioaddr + IntrStatus);
if ((status & (TxOK | TxErr | PCIErr)) != 0) break; if ((status & (TxOK | TxErr | PCIErr)) != 0) break;
} while (currticks() < to); udelay(10);
} while (i++ < RTL_TIMEOUT);
txstatus = inl(ioaddr + TxStatus0 + cur_tx*4); txstatus = inl(ioaddr + TxStatus0 + cur_tx*4);
@ -458,8 +455,8 @@ static int rtl_transmit(struct eth_device *dev, volatile void *packet, int lengt
return length; return length;
} else { } else {
#ifdef DEBUG_TX #ifdef DEBUG_TX
printf("tx timeout/error (%d ticks), status %hX txstatus %X\n", printf("tx timeout/error (%d usecs), status %hX txstatus %X\n",
currticks()-to, status, txstatus); 10*i, status, txstatus);
#endif #endif
rtl_reset(dev); rtl_reset(dev);