diff options
author | John Keller <jpk@sgi.com> | 2006-12-22 12:50:04 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-01-04 12:18:19 -0500 |
commit | 3948ec9406f9a60a43d63f23f6f5284db6529b9c (patch) | |
tree | 85bad329fb23be9527492d773dc2ed64f3908d60 /arch/ia64 | |
parent | a7ec3f5289681e9d63b65db5f56857f998812b4b (diff) |
ACPI: Altix: ACPI _PRT support
Provide ACPI _PRT support for SN Altix systems.
The SN Altix platform does not conform to the
IOSAPIC IRQ routing model, so a new acpi_irq_model
(ACPI_IRQ_MODEL_PLATFORM) has been defined. The SN
platform specific code sets acpi_irq_model to
this new value, and keys off of it in acpi_register_gsi()
to avoid the iosapic code path.
Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/kernel/acpi.c | 3 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/io_acpi_init.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 73ef4a85b861..ef2fe474f107 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void) | |||
590 | */ | 590 | */ |
591 | int acpi_register_gsi(u32 gsi, int triggering, int polarity) | 591 | int acpi_register_gsi(u32 gsi, int triggering, int polarity) |
592 | { | 592 | { |
593 | if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) | ||
594 | return gsi; | ||
595 | |||
593 | if (has_8259 && gsi < 16) | 596 | if (has_8259 && gsi < 16) |
594 | return isa_irq_to_vector(gsi); | 597 | return isa_irq_to_vector(gsi); |
595 | 598 | ||
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c index 99d7f278612a..cb96b4ea7df6 100644 --- a/arch/ia64/sn/kernel/io_acpi_init.c +++ b/arch/ia64/sn/kernel/io_acpi_init.c | |||
@@ -223,6 +223,9 @@ sn_io_acpi_init(void) | |||
223 | u64 result; | 223 | u64 result; |
224 | s64 status; | 224 | s64 status; |
225 | 225 | ||
226 | /* SN Altix does not follow the IOSAPIC IRQ routing model */ | ||
227 | acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM; | ||
228 | |||
226 | acpi_bus_register_driver(&acpi_sn_hubdev_driver); | 229 | acpi_bus_register_driver(&acpi_sn_hubdev_driver); |
227 | status = sal_ioif_init(&result); | 230 | status = sal_ioif_init(&result); |
228 | if (status || result) | 231 | if (status || result) |