[PATCH 12/17] xen: use acpi_get_override_irq() to get triggering for legacy irqs

Jeremy Fitzhardinge
2009-05-12T23:28:59Z

From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

We need to set up proper IO apic entries for legacy irqs, which are
not normally configured by either normal acpi interrupt routing or
PNP.

This also generalizes the acpi interrupt setup, so we can remove it
as a special case.

[ Impact: compatibility with legacy/ISA hardware ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
arch/x86/xen/pci.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/arch/x86/xen/pci.c b/arch/x86/xen/pci.c
index 00ad6df..db0c74c 100644
--- a/arch/x86/xen/pci.c
+++ b/arch/x86/xen/pci.c
@@ -65,19 +65,15 @@ void __init xen_setup_pirqs(void)
{
int irq;

-#ifdef CONFIG_ACPI
- /*
- * Set up acpi interrupt in acpi_gbl_FADT.sci_interrupt.
- */
- if (acpi_gbl_FADT.sci_interrupt > 0) {
- irq = xen_allocate_pirq(acpi_gbl_FADT.sci_interrupt);
-
- printk(KERN_INFO "xen: allocated irq %d for acpi %d\n",
- irq, acpi_gbl_FADT.sci_interrupt);
- }
-#endif
-
/* Pre-allocate legacy irqs */
- for (irq = 0; irq < NR_IRQS_LEGACY; irq++)
- xen_allocate_pirq(irq);
+ for (irq = 0; irq < NR_IRQS_LEGACY; irq++) {
+ int trigger, polarity;
+
+ if (acpi_get_override_irq(irq, &trigger, &polarity) == -1)
+ continue;
+
+ xen_register_gsi(irq,
+ trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE,
+ polarity ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH);
+ }
}
--
1.6.0.6