[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1273623083.2314.4.camel@localhost.localdomain>
Date: Wed, 12 May 2010 01:11:23 +0100
From: Bastien Nocera <hadess@...ess.net>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: linux-kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH] Disable i8042 checks on Intel Apple Macs
As those computers never had any i8042 controllers, and the
current lookup code could potentially lock up/hang/wait for
timeout for long periods of time.
Fixes intermittent hangs on boot on a MacbookAir1,1
Signed-off-by: Bastien Nocera <hadess@...ess.net>
---
drivers/input/serio/i8042-x86ia64io.h | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index ead0494..e859902 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -479,6 +479,22 @@ static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = {
{ }
};
+/* Intel Apple Macs never have an i8042 controller,
+ * so we shouldn't even try to probe for it */
+static const struct dmi_system_id __initconst i8042_dmi_no_probe_table[] = {
+ {
+ .matches = {
+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
+ },
+ },
+ {
+ .matches = {
+ DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
+ },
+ },
+ {}
+};
+
#ifdef CONFIG_PNP
static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = {
{
@@ -833,6 +849,8 @@ static int __init i8042_platform_init(void)
* if (!request_region(I8042_DATA_REG, 16, "i8042"))
* return -EBUSY;
*/
+ if (dmi_check_system(i8042_dmi_no_probe_table))
+ return -ENODEV;
i8042_kbd_irq = I8042_MAP_IRQ(1);
i8042_aux_irq = I8042_MAP_IRQ(12);
--
1.7.0.1
--
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