2009-03-17 18:38:15

by Karsten Wiese

Subject: [PATCH] r8169: Fix irq masking in rtl8169_interrupt()

Only adjust the NAPI bits of the interruptmask, if netif_rx_schedule_prep()
returns true.
Without this, I see interrupt storms here using 2.6.29-rcx and 2.6.27.19 and
device needed rmmod r8169 + modprobe r8169 to start working.

Signed-off-by: Karsten Wiese <[email protected]>
---
drivers/net/r8169.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b347340..0c943ba 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3708,12 +3708,11 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
rtl8169_check_link_status(dev, tp, ioaddr);

if (status & tp->napi_event) {
- RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
- tp->intr_mask = ~tp->napi_event;
-
- if (likely(netif_rx_schedule_prep(&tp->napi)))
+ if (likely(netif_rx_schedule_prep(&tp->napi))) {
+ RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
+ tp->intr_mask = ~tp->napi_event;
__netif_rx_schedule(&tp->napi);
- else if (netif_msg_intr(tp)) {
+ } else if (netif_msg_intr(tp)) {
printk(KERN_INFO "%s: interrupt %04x in poll\n",
dev->name, status);
}
--
1.6.0.6

2009-03-17 20:09:56

by Jeff Garzik

Subject: Re: [PATCH] r8169: Fix irq masking in rtl8169_interrupt()

Karsten Wiese wrote:
> Only adjust the NAPI bits of the interruptmask, if netif_rx_schedule_prep()
> returns true.
> Without this, I see interrupt storms here using 2.6.29-rcx and 2.6.27.19 and
> device needed rmmod r8169 + modprobe r8169 to start working.
>
> Signed-off-by: Karsten Wiese <[email protected]>
> ---
> drivers/net/r8169.c | 9 ++++-----
> 1 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
> index b347340..0c943ba 100644
> --- a/drivers/net/r8169.c
> +++ b/drivers/net/r8169.c
> @@ -3708,12 +3708,11 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
> rtl8169_check_link_status(dev, tp, ioaddr);
>
> if (status & tp->napi_event) {
> - RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
> - tp->intr_mask = ~tp->napi_event;
> -
> - if (likely(netif_rx_schedule_prep(&tp->napi)))
> + if (likely(netif_rx_schedule_prep(&tp->napi))) {
> + RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
> + tp->intr_mask = ~tp->napi_event;
> __netif_rx_schedule(&tp->napi);
> - else if (netif_msg_intr(tp)) {
> + } else if (netif_msg_intr(tp)) {
> printk(KERN_INFO "%s: interrupt %04x in poll\n",


FWIW, you should CC net driver patches to [email protected], so
that they get tracked in patchworks and handled by the right people.

Jeff