lkml.org 
[lkml]   [2004]   [Mar]   [28]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 29 Mar 2004 00:36:00 +0200
FromFrancois Romieu <>
SubjectRe: usage of RealTek 8169 crashes my Linux system
Bernd Fuhrmann <silverbanana@gmx.de> :
[...]
> I haven't tried them yet, because I haven't seen any changes in the 
> recent mm-patches to that r8169 driver (just checked all the 
> announce.txt files of 2.6.5-rc1&2). Maybe I missed something.

The changes comes from the bk-netdev part of M. Morton's patchset.
The changelog is a bit terse for those (hint, hint).

> If you think one of these patches might fix it (please tell me the exact 
> patch number) I will apply and test it as soon as possible.

Please try any recent -mm.

nmi_watchdog and magic sysrq are your friends. Don't expect much from
syslog though.

Once you have applied -mm patch, you may apply the attached patch as well
to help debugging.

--
Ueimor
 drivers/net/r8169.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
diff -puN drivers/net/r8169.c~r8169-break-irq-loop drivers/net/r8169.c
--- linux-2.6.5-rc2/drivers/net/r8169.c~r8169-break-irq-loop	2004-03-24 23:52:23.000000000 +0100
+++ linux-2.6.5-rc2-fr/drivers/net/r8169.c	2004-03-24 23:56:26.000000000 +0100
@@ -1345,6 +1345,7 @@ rtl8169_tx_interrupt(struct net_device *
 		     void *ioaddr)
 {
 	unsigned long dirty_tx, tx_left = 0;
+	int max_try = 8192;
 
 	assert(dev != NULL);
 	assert(tp != NULL);
@@ -1353,7 +1354,7 @@ rtl8169_tx_interrupt(struct net_device *
 	dirty_tx = tp->dirty_tx;
 	tx_left = tp->cur_tx - dirty_tx;
 
-	while (tx_left > 0) {
+	while ((tx_left > 0) && --max_try) {
 		int entry = dirty_tx % NUM_TX_DESC;
 
 		if (!(le32_to_cpu(tp->TxDescArray[entry].status) & OWNbit)) {
@@ -1371,6 +1372,9 @@ rtl8169_tx_interrupt(struct net_device *
 		}
 	}
 
+	if (!max_try)
+		printk(KERN_INFO "%s: strangeness in Tx handler", dev->name);
+
 	if (tp->dirty_tx != dirty_tx) {
 		tp->dirty_tx = dirty_tx;
 		if (netif_queue_stopped(dev))
@@ -1406,6 +1410,7 @@ rtl8169_rx_interrupt(struct net_device *
 {
 	unsigned long cur_rx, rx_left;
 	int delta;
+	int max_try = 8192;
 
 	assert(dev != NULL);
 	assert(tp != NULL);
@@ -1414,7 +1419,7 @@ rtl8169_rx_interrupt(struct net_device *
 	cur_rx = tp->cur_rx;
 	rx_left = NUM_RX_DESC + tp->dirty_rx - cur_rx;
 
-	while (rx_left > 0) {
+	while ((rx_left > 0) && --max_try) {
 		int entry = cur_rx % NUM_RX_DESC;
 		u32 status = le32_to_cpu(tp->RxDescArray[entry].status);
 
@@ -1461,6 +1466,9 @@ rtl8169_rx_interrupt(struct net_device *
 		rx_left--;
 	}
 
+	if (!max_try)
+		printk(KERN_INFO "%s: strangeness in Rx handler", dev->name);
+
 	tp->cur_rx = cur_rx;
 
 	delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
_
\
 
 \ /
  Last update: 2005-03-22 13:02    [from the cache]
©2003-2008