Since msi_remove_pci_irq_vectors is designed to be called during
hotplug remove it is actively wrong to query the hardware and expect
meaningful results back.
To that end remove the pci_find_capability calls. Testing
dev->msi_enabled and dev->msix_enabled gives us all of the information
we need.
Signed-off-by: Eric W. Biederman <redacted>
---
drivers/pci/msi.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 5e7a187..db9c1d7 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -865,13 +865,10 @@ void pci_disable_msix(struct pci_dev* dev)
**/
void msi_remove_pci_irq_vectors(struct pci_dev* dev)
{
- int pos;
-
if (!pci_msi_enable || !dev)
return;
- pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
- if (pos > 0 && dev->msi_enabled) {
+ if (dev->msi_enabled) {
if (irq_has_action(dev->first_msi_irq)) {
printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
"called without free_irq() on MSI irq %d\n",@@ -880,8 +877,7 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
} else /* Release MSI irq assigned to this device */
msi_free_irq(dev, dev->first_msi_irq);
}
- pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
- if (pos > 0 && dev->msix_enabled) {
+ if (dev->msix_enabled) {
int irq, head, tail = 0, warning = 0;
void __iomem *base = NULL;
--
1.4.4.1.g278f
This is a note to let you know that I've just added the patch titled
Subject: msi: Fix msi_remove_pci_irq_vectors.
to my gregkh-2.6 tree. Its filename is
msi-fix-msi_remove_pci_irq_vectors.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
From owner-linux-pci@atrey.karlin.mff.cuni.cz Wed Jan 31 22:00:21 2007
From: ebiederm@xmission.com (Eric W. Biederman)
Date: Sun, 28 Jan 2007 12:45:54 -0700
Subject: msi: Fix msi_remove_pci_irq_vectors.
To: Greg Kroah-Hartman <redacted>
Cc: "David S. Miller" <davem@davemloft.net>, Kyle McMartin <redacted>, <redacted>, Brice Goglin <redacted>, <redacted>, Michael Ellerman <redacted>, Grant Grundler <redacted>, Tony Luck <tony.luck@intel.com>, Ingo Molnar <redacted>
Message-ID: [off-list ref]
Since msi_remove_pci_irq_vectors is designed to be called during
hotplug remove it is actively wrong to query the hardware and expect
meaningful results back.
To that end remove the pci_find_capability calls. Testing
dev->msi_enabled and dev->msix_enabled gives us all of the information
we need.
Signed-off-by: Eric W. Biederman <redacted>
Acked-by: Ingo Molnar <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/pci/msi.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
--- gregkh-2.6.orig/drivers/pci/msi.c
+++ gregkh-2.6/drivers/pci/msi.c
@@ -854,13 +854,10 @@ void pci_disable_msix(struct pci_dev* de
**/
void msi_remove_pci_irq_vectors(struct pci_dev* dev)
{
- int pos;
-
if (!pci_msi_enable || !dev)
return;
- pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
- if (pos > 0 && dev->msi_enabled) {
+ if (dev->msi_enabled) {
if (irq_has_action(dev->first_msi_irq)) {
printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
"called without free_irq() on MSI irq %d\n",@@ -869,8 +866,7 @@ void msi_remove_pci_irq_vectors(struct p
} else /* Release MSI irq assigned to this device */
msi_free_irq(dev, dev->first_msi_irq);
}
- pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
- if (pos > 0 && dev->msix_enabled) {
+ if (dev->msix_enabled) {
int irq, head, tail = 0, warning = 0;
void __iomem *base = NULL;
Patches currently in gregkh-2.6 which might be from greg@kroah.com are