From: Manfred Spraul <manfred@colorfullife.com>
To: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>,
Ayaz Abdulla <aabdulla@nvidia.com>,
nedev <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: MSI interrupts and disable_irq
Date: Sun, 14 Oct 2007 09:15:35 +0200 [thread overview]
Message-ID: <4711C217.2010605@colorfullife.com> (raw)
In-Reply-To: <86802c440710132259o6e82f6s4bed7b25bd5636e9@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
Yinghai Lu wrote:
> On 10/13/07, Manfred Spraul <manfred@colorfullife.com> wrote:
>
>> Someone around with a MSI capable board? The forcedeth driver does
>> dev->irq = pci_dev->irq
>> in nv_probe(), especially before pci_enable_msi().
>> Does pci_enable_msi() change pci_dev->irq? Then we would disable the
>> wrong interrupt....
>>
>
> the request_irq==>setup_irq will make dev->irq = pci_dev->irq.
>
>
Where is that?
Otherwise I would propose the attached patch. My board is not
MSI-capable, thus I can't test it myself.
--
Manfred
[-- Attachment #2: patch-forcedeth-msi --]
[-- Type: text/plain, Size: 3043 bytes --]
--- 2.6/drivers/net/forcedeth.c 2007-10-07 17:33:18.000000000 +0200
+++ build-2.6/drivers/net/forcedeth.c 2007-10-13 11:34:20.000000000 +0200
@@ -988,7 +988,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- enable_irq(dev->irq);
+ enable_irq(np->pci_dev->irq);
} else {
enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
@@ -1004,7 +1004,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- disable_irq(dev->irq);
+ disable_irq(np->pci_dev->irq);
} else {
disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);
@@ -1601,7 +1601,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- disable_irq(dev->irq);
+ disable_irq(np->pci_dev->irq);
} else {
disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
}
@@ -1619,7 +1619,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- enable_irq(dev->irq);
+ enable_irq(np->pci_dev->irq);
} else {
enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);
}
@@ -3557,10 +3557,12 @@
if (ret != 0 && np->msi_flags & NV_MSI_CAPABLE) {
if ((ret = pci_enable_msi(np->pci_dev)) == 0) {
np->msi_flags |= NV_MSI_ENABLED;
+ dev->irq = np->pci_dev->irq;
if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) {
printk(KERN_INFO "forcedeth: request_irq failed %d\n", ret);
pci_disable_msi(np->pci_dev);
np->msi_flags &= ~NV_MSI_ENABLED;
+ dev->irq = np->pci_dev->irq;
goto out_err;
}
@@ -3623,7 +3625,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- disable_irq_lockdep(dev->irq);
+ disable_irq_lockdep(np->pci_dev->irq);
mask = np->irqmask;
} else {
if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {
@@ -3641,6 +3643,8 @@
}
np->nic_poll_irq = 0;
+ /* disable_irq() contains synchronize_irq, thus no irq handler can run now */
+
if (np->recover_error) {
np->recover_error = 0;
printk(KERN_INFO "forcedeth: MAC in recoverable error state\n");
@@ -3677,7 +3681,6 @@
}
}
- /* FIXME: Do we need synchronize_irq(dev->irq) here? */
writel(mask, base + NvRegIrqMask);
pci_push(base);
@@ -3690,7 +3693,7 @@
if (np->msi_flags & NV_MSI_X_ENABLED)
enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);
else
- enable_irq_lockdep(dev->irq);
+ enable_irq_lockdep(np->pci_dev->irq);
} else {
if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {
nv_nic_irq_rx(0, dev);
@@ -4943,7 +4946,7 @@
np->in_shutdown = 1;
spin_unlock_irq(&np->lock);
netif_poll_disable(dev);
- synchronize_irq(dev->irq);
+ synchronize_irq(np->pci_dev->irq);
del_timer_sync(&np->oom_kick);
del_timer_sync(&np->nic_poll);
next prev parent reply other threads:[~2007-10-14 7:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <46FC15A9.1070803@nvidia.com>
2007-09-29 2:47 ` MSI interrupts and disable_irq Jeff Garzik
2007-09-29 3:08 ` Stephen Hemminger
2007-10-05 22:12 ` Eric W. Biederman
2007-10-06 6:23 ` Yinghai Lu
2007-10-06 17:43 ` Yinghai Lu
2007-10-06 17:59 ` Jeff Garzik
2007-10-07 16:54 ` Manfred Spraul
2007-10-13 9:30 ` Manfred Spraul
2007-10-14 5:59 ` Yinghai Lu
2007-10-14 7:15 ` Manfred Spraul [this message]
2007-10-14 19:55 ` Yinghai Lu
2007-10-14 21:47 ` Benjamin Herrenschmidt
2007-10-14 23:15 ` Yinghai Lu
2007-10-14 23:36 ` Benjamin Herrenschmidt
2007-10-15 22:17 ` Jeff Garzik
2007-10-16 17:23 ` Yinghai Lu
2007-10-16 17:39 ` Jeff Garzik
2007-10-16 17:59 ` Yinghai Lu
2007-10-16 19:44 ` Jeff Garzik
2007-10-16 18:01 ` Yinghai Lu
2007-10-17 19:43 ` Manfred Spraul
2007-10-02 19:03 ` Manfred Spraul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4711C217.2010605@colorfullife.com \
--to=manfred@colorfullife.com \
--cc=aabdulla@nvidia.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=yhlu.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox