136 lines
4.6 KiB
Diff
136 lines
4.6 KiB
Diff
From 76ccc297018d25d55b789bbd508861ef1e2cdb0c Mon Sep 17 00:00:00 2001
|
|
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Date: Fri, 16 Dec 2011 17:38:18 -0500
|
|
Subject: x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
|
|
|
|
The MSI restore function will become a function pointer in an
|
|
x86_msi_ops struct. It defaults to the implementation in the
|
|
io_apic.c and msi.c. We piggyback on the indirection mechanism
|
|
introduced by "x86: Introduce x86_msi_ops".
|
|
|
|
Cc: x86@kernel.org
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
|
Cc: "H. Peter Anvin" <hpa@zytor.com>
|
|
Cc: linux-pci@vger.kernel.org
|
|
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
|
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
|
|
---
|
|
arch/x86/include/asm/pci.h | 9 +++++++++
|
|
arch/x86/include/asm/x86_init.h | 1 +
|
|
arch/x86/kernel/x86_init.c | 1 +
|
|
drivers/pci/msi.c | 29 +++++++++++++++++++++++++++--
|
|
4 files changed, 38 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
|
|
index d498943..df75d07 100644
|
|
--- a/arch/x86/include/asm/pci.h
|
|
+++ b/arch/x86/include/asm/pci.h
|
|
@@ -112,19 +112,28 @@ static inline void x86_teardown_msi_irq(unsigned int irq)
|
|
{
|
|
x86_msi.teardown_msi_irq(irq);
|
|
}
|
|
+static inline void x86_restore_msi_irqs(struct pci_dev *dev, int irq)
|
|
+{
|
|
+ x86_msi.restore_msi_irqs(dev, irq);
|
|
+}
|
|
#define arch_setup_msi_irqs x86_setup_msi_irqs
|
|
#define arch_teardown_msi_irqs x86_teardown_msi_irqs
|
|
#define arch_teardown_msi_irq x86_teardown_msi_irq
|
|
+#define arch_restore_msi_irqs x86_restore_msi_irqs
|
|
/* implemented in arch/x86/kernel/apic/io_apic. */
|
|
int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
|
|
void native_teardown_msi_irq(unsigned int irq);
|
|
+void native_restore_msi_irqs(struct pci_dev *dev, int irq);
|
|
/* default to the implementation in drivers/lib/msi.c */
|
|
#define HAVE_DEFAULT_MSI_TEARDOWN_IRQS
|
|
+#define HAVE_DEFAULT_MSI_RESTORE_IRQS
|
|
void default_teardown_msi_irqs(struct pci_dev *dev);
|
|
+void default_restore_msi_irqs(struct pci_dev *dev, int irq);
|
|
#else
|
|
#define native_setup_msi_irqs NULL
|
|
#define native_teardown_msi_irq NULL
|
|
#define default_teardown_msi_irqs NULL
|
|
+#define default_restore_msi_irqs NULL
|
|
#endif
|
|
|
|
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
|
|
diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
|
|
index 1971e65..cd52084 100644
|
|
--- a/arch/x86/include/asm/x86_init.h
|
|
+++ b/arch/x86/include/asm/x86_init.h
|
|
@@ -177,6 +177,7 @@ struct x86_msi_ops {
|
|
int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
|
|
void (*teardown_msi_irq)(unsigned int irq);
|
|
void (*teardown_msi_irqs)(struct pci_dev *dev);
|
|
+ void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
|
|
};
|
|
|
|
extern struct x86_init_ops x86_init;
|
|
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
|
|
index c1d6cd5..83b05ad 100644
|
|
--- a/arch/x86/kernel/x86_init.c
|
|
+++ b/arch/x86/kernel/x86_init.c
|
|
@@ -114,4 +114,5 @@ struct x86_msi_ops x86_msi = {
|
|
.setup_msi_irqs = native_setup_msi_irqs,
|
|
.teardown_msi_irq = native_teardown_msi_irq,
|
|
.teardown_msi_irqs = default_teardown_msi_irqs,
|
|
+ .restore_msi_irqs = default_restore_msi_irqs,
|
|
};
|
|
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
|
|
index 82de95e..a825d78 100644
|
|
--- a/drivers/pci/msi.c
|
|
+++ b/drivers/pci/msi.c
|
|
@@ -86,6 +86,31 @@ void default_teardown_msi_irqs(struct pci_dev *dev)
|
|
}
|
|
#endif
|
|
|
|
+#ifndef arch_restore_msi_irqs
|
|
+# define arch_restore_msi_irqs default_restore_msi_irqs
|
|
+# define HAVE_DEFAULT_MSI_RESTORE_IRQS
|
|
+#endif
|
|
+
|
|
+#ifdef HAVE_DEFAULT_MSI_RESTORE_IRQS
|
|
+void default_restore_msi_irqs(struct pci_dev *dev, int irq)
|
|
+{
|
|
+ struct msi_desc *entry;
|
|
+
|
|
+ entry = NULL;
|
|
+ if (dev->msix_enabled) {
|
|
+ list_for_each_entry(entry, &dev->msi_list, list) {
|
|
+ if (irq == entry->irq)
|
|
+ break;
|
|
+ }
|
|
+ } else if (dev->msi_enabled) {
|
|
+ entry = irq_get_msi_desc(irq);
|
|
+ }
|
|
+
|
|
+ if (entry)
|
|
+ write_msi_msg(irq, &entry->msg);
|
|
+}
|
|
+#endif
|
|
+
|
|
static void msi_set_enable(struct pci_dev *dev, int pos, int enable)
|
|
{
|
|
u16 control;
|
|
@@ -372,7 +397,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev)
|
|
|
|
pci_intx_for_msi(dev, 0);
|
|
msi_set_enable(dev, pos, 0);
|
|
- write_msi_msg(dev->irq, &entry->msg);
|
|
+ arch_restore_msi_irqs(dev, dev->irq);
|
|
|
|
pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control);
|
|
msi_mask_irq(entry, msi_capable_mask(control), entry->masked);
|
|
@@ -400,7 +425,7 @@ static void __pci_restore_msix_state(struct pci_dev *dev)
|
|
pci_write_config_word(dev, pos + PCI_MSIX_FLAGS, control);
|
|
|
|
list_for_each_entry(entry, &dev->msi_list, list) {
|
|
- write_msi_msg(entry->irq, &entry->msg);
|
|
+ arch_restore_msi_irqs(dev, entry->irq);
|
|
msix_mask_irq(entry, entry->masked);
|
|
}
|
|
|
|
--
|
|
1.7.6.4
|
|
|