From patchwork Tue Mar 17 19:34:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Wiese X-Patchwork-Id: 24572 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A20C8DDF4E for ; Wed, 18 Mar 2009 06:35:11 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752821AbZCQTfI (ORCPT ); Tue, 17 Mar 2009 15:35:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753085AbZCQTfH (ORCPT ); Tue, 17 Mar 2009 15:35:07 -0400 Received: from mout0.freenet.de ([195.4.92.90]:44715 "EHLO mout0.freenet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752211AbZCQTfG (ORCPT ); Tue, 17 Mar 2009 15:35:06 -0400 Received: from [195.4.92.23] (helo=13.mx.freenet.de) by mout0.freenet.de with esmtpa (ID fzu@wemgehoertderstaat.de) (port 25) (Exim 4.69 #79) id 1Ljf3y-0001mZ-GN; Tue, 17 Mar 2009 20:34:58 +0100 Received: from p54901cce.dip0.t-ipconnect.de ([84.144.28.206]:61477 helo=a64.localdomain) by 13.mx.freenet.de with esmtpa (ID fzu@wemgehoertderstaat.de) (port 25) (Exim 4.69 #76) id 1Ljf3y-0001gJ-7x; Tue, 17 Mar 2009 20:34:58 +0100 From: Karsten Wiese To: netdev@vger.kernel.org Subject: [PATCH] r8169: Fix irq masking in rtl8169_interrupt() Date: Tue, 17 Mar 2009 20:34:54 +0100 User-Agent: KMail/1.11.1 (Linux/2.6.29-rc8; KDE/4.2.1; x86_64; ; ) MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903172034.55241.fzu@wemgehoertderstaat.de> Cc: Francois Romieu , Rafael Wysocki Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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); }