From ae9dfacaca5ce7be7ad75aec2fbc938fcf6fa21a Mon Sep 17 00:00:00 2001 From: Hirofumi Ogawa Date: Sat, 24 Jan 2004 05:57:20 -0500 Subject: [PATCH] [netdrvr 8139cp] fix NAPI race Andreas Happe writes: > my notebook (hp/compaq nx7000) still crashes when using 8139cp (runs > rock solid with 8139too driver). The computer just locks up, there is no > dmesg output. This has happened since I've got this laptop (around > november '03). It seems 8139cp.c has the race condition of rx_poll and interrupt. NOTE, since I don't have this device, patch is untested. Sorry. --- drivers/net/8139cp.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index bb57ed880f15..9bfeed893229 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c @@ -615,8 +615,10 @@ rx_next: if (cpr16(IntrStatus) & cp_rx_intr_mask) goto rx_status_loop; - netif_rx_complete(dev); + local_irq_disable(); cpw16_f(IntrMask, cp_intr_mask); + __netif_rx_complete(dev); + local_irq_enable(); return 0; /* done */ } @@ -643,6 +645,12 @@ cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs) spin_lock(&cp->lock); + /* close possible race's with dev_close */ + if (unlikely(!netif_running(dev))) { + cpw16(IntrMask, 0); + goto out; + } + if (status & (RxOK | RxErr | RxEmpty | RxFIFOOvr)) { if (netif_rx_schedule_prep(dev)) { cpw16_f(IntrMask, cp_norx_intr_mask); @@ -664,7 +672,7 @@ cp_interrupt (int irq, void *dev_instance, struct pt_regs *regs) /* TODO: reset hardware */ } - +out: spin_unlock(&cp->lock); return IRQ_HANDLED; } -- 2.39.5