The patch titled
Altix: ACPI _PRT support
has been removed from the -mm tree. Its filename was
altix-acpi-_prt-support.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Altix: ACPI _PRT support
From: John Keller <jpk@xxxxxxx>
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@xxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: "Luck, Tony" <tony.luck@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/kernel/acpi.c | 3 +++
arch/ia64/sn/kernel/io_acpi_init.c | 3 +++
drivers/acpi/bus.c | 3 +++
include/linux/acpi.h | 1 +
4 files changed, 10 insertions(+)
diff -puN arch/ia64/kernel/acpi.c~altix-acpi-_prt-support arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/acpi.c~altix-acpi-_prt-support
+++ a/arch/ia64/kernel/acpi.c
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void)
*/
int acpi_register_gsi(u32 gsi, int triggering, int polarity)
{
+ if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+ return gsi;
+
if (has_8259 && gsi < 16)
return isa_irq_to_vector(gsi);
diff -puN arch/ia64/sn/kernel/io_acpi_init.c~altix-acpi-_prt-support arch/ia64/sn/kernel/io_acpi_init.c
--- a/arch/ia64/sn/kernel/io_acpi_init.c~altix-acpi-_prt-support
+++ a/arch/ia64/sn/kernel/io_acpi_init.c
@@ -489,6 +489,9 @@ sn_io_acpi_init(void)
u64 result;
s64 status;
+ /* SN Altix does not follow the IOSAPIC IRQ routing model */
+ acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+
acpi_bus_register_driver(&acpi_sn_hubdev_driver);
status = sal_ioif_init(&result);
if (status || result)
diff -puN drivers/acpi/bus.c~altix-acpi-_prt-support drivers/acpi/bus.c
--- a/drivers/acpi/bus.c~altix-acpi-_prt-support
+++ a/drivers/acpi/bus.c
@@ -561,6 +561,9 @@ static int __init acpi_bus_init_irq(void
case ACPI_IRQ_MODEL_IOSAPIC:
message = "IOSAPIC";
break;
+ case ACPI_IRQ_MODEL_PLATFORM:
+ message = "platform specific model";
+ break;
default:
printk(KERN_WARNING PREFIX "Unknown interrupt routing model\n");
return -ENODEV;
diff -puN include/linux/acpi.h~altix-acpi-_prt-support include/linux/acpi.h
--- a/include/linux/acpi.h~altix-acpi-_prt-support
+++ a/include/linux/acpi.h
@@ -47,6 +47,7 @@ enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
ACPI_IRQ_MODEL_IOAPIC,
ACPI_IRQ_MODEL_IOSAPIC,
+ ACPI_IRQ_MODEL_PLATFORM,
ACPI_IRQ_MODEL_COUNT
};
_
Patches currently in -mm which might be from jpk@xxxxxxx are
git-acpi.patch
altix-acpi-ssdt-pci-device-support.patch
altix-add-acpi-ssdt-pci-device-support-hotplug.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
