[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080621014047.GA20908@srcf.ucam.org>
Date: Sat, 21 Jun 2008 02:40:47 +0100
From: Matthew Garrett <mjg59@...f.ucam.org>
To: "Maciej W. Rozycki" <macro@...ux-mips.org>
Cc: "Rafael J. Wysocki" <rjw@...k.pl>, Ingo Molnar <mingo@...e.hu>,
Stephen Rothwell <sfr@...b.auug.org.au>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Thomas Gleixner <tglx@...utronix.de>,
ACPI Devel Maling List <linux-acpi@...r.kernel.org>,
Len Brown <lenb@...nel.org>
Subject: Re: linux-next: Tree for June 13: IO APIC breakage on HP nx6325
On Sat, Jun 21, 2008 at 02:09:00AM +0100, Maciej W. Rozycki wrote:
> Meanwhile we may consider implementing a workaround. I think one that
> does not hurt competent vendors would be preferable. The DSDT containing
> the rubbish described here is marked with an OEM ID: "HP " and OEM
> Table ID: "SB400". These keys could be used to remove IRQ0 information
> from the IRQ tables. Our code is prepared to handle such a case.
> Something easy to do for a seasoned ACPI fiddler, I suppose. ;)
Something roughly like the following? Entirely untested, my 6125 is in a
box somewhere. My recollection is that skip_timer_override will disable
the IRQ 0->2 mapping, which I believe is what's broken here?
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 33c5216..6ca5eff 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1060,6 +1060,16 @@ static int __init force_acpi_ht(const struct dmi_system_id *d)
return 0;
}
+#ifdef CONFIG_X86_IO_APIC
+static int __init force_skip_timer_override(const struct dmi_system_id *d)
+{
+ printk(KERN_NOTICE "%s detected: disabling timer overrides",
+ d->ident);
+ acpi_skip_timer_override = 1;
+ return 0;
+}
+#endif
+
/*
* If your system is blacklisted here, but you find that acpi=force
* works for you, please contact acpi-devel@...rceforge.net
@@ -1227,6 +1237,24 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
},
},
+#ifdef CONFIG_X86_IO_APIC
+ {
+ .callback = force_skip_timer_override,
+ .ident = "HP NX6125 laptop",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nx6125"),
+ },
+ },
+ {
+ .callback = force_skip_timer_override,
+ .ident = "HP NX6325 laptop",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq nx6325"),
+ },
+ },
+#endif
{}
};
--
Matthew Garrett | mjg59@...f.ucam.org
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists