From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757457AbYCaV4X (ORCPT ); Mon, 31 Mar 2008 17:56:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755440AbYCaV4N (ORCPT ); Mon, 31 Mar 2008 17:56:13 -0400 Received: from py-out-1112.google.com ([64.233.166.179]:17036 "EHLO py-out-1112.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755218AbYCaV4M (ORCPT ); Mon, 31 Mar 2008 17:56:12 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=reply-to:to:subject:date:user-agent:cc:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id:from; b=NKNGdbfYwANaBYm8RDMJR8WqiQrehVCz/ocx7XkpuQhYRrEXNlVZU0rD9hqKbIAW7Vl+IrwFZum90Fxv8D5scq+W/soYvLMlPlsU8FcBRqrR8lOei65rp7rCnv2OXERozuxHOQjLozJPKI87ZxBXU0Weor65FS8UfOudvnHL2EE= Reply-To: yhlu.kernel@gmail.com To: Andrew Morton , David Miller , Jeff Garzik , Greg KH , Ingo Molnar Subject: [PATCH] r8169: fix IRQx nobody cared for shared irq with INTx Date: Mon, 31 Mar 2008 14:58:55 -0700 User-Agent: KMail/1.9.6 (enterprise 20070904.708012) Cc: kernel list , netdev@vger.kernel.org, linux-pci@atrey.karlin.mff.cuni.cz, Vadim Dyadkin References: <200803291403.23479.yhlu.kernel@gmail.com> In-Reply-To: <200803291403.23479.yhlu.kernel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200803311458.56119.yhlu.kernel@gmail.com> From: Yinghai Lu Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org try to solve troubles with r8169 http://lkml.org/lkml/2007/8/12/225 same to [PATCH] e1000: fix IRQx nobody cared for shared irq with INTx http://lkml.org/lkml/2008/3/29/103 Signed-off-by: Yinghai Lu diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3acfeea..7405a95 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1619,6 +1619,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->dev = dev; tp->msg_enable = netif_msg_init(debug.msg_enable, R8169_MSG_DEFAULT); + /* disable INTx at first */ + pci_intx(pdev, 0); /* enable device (incl. PCI PM wakeup and hotplug setup) */ rc = pci_enable_device(pdev); if (rc < 0) { @@ -1887,6 +1889,11 @@ static int rtl8169_open(struct net_device *dev) if (retval < 0) goto err_release_ring_2; + if (!(tp->features & RTL_FEATURE_MSI)) { + /* enable INTx if not using MSI */ + pci_intx(pdev, 1); + } + #ifdef CONFIG_R8169_NAPI napi_enable(&tp->napi); #endif