rpms/kernel/F-13 disable-i8042-check-on-apple-mac.patch, NONE, 1.1 kernel.spec, 1.2016, 1.2017

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12249

Modified Files:
	kernel.spec 
Added Files:
	disable-i8042-check-on-apple-mac.patch 
Log Message:
* Tue May 4 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-81
- disable-i8042-check-on-apple-mac.patch: avoid long delay or hang booting
  on Intel Apple Macs.


disable-i8042-check-on-apple-mac.patch:
 i8042.c |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

--- NEW FILE disable-i8042-check-on-apple-mac.patch ---
From: Bastien Nocera <hadess at hadess.net>
Subject: [PATCH] Disable i8042 checks on Intel Apple Macs
Date: Wed, 20 Jan 2010 18:23:13 +0000

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 at hadess.net>
---
 drivers/input/serio/i8042.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index d84a36e..2be7207 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1438,12 +1438,30 @@ static struct platform_driver i8042_driver = {
 	.shutdown	= i8042_shutdown,
 };
 
+static struct dmi_system_id __initdata dmi_system_table[] = {
+	{
+		.matches = {
+			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.")
+		},
+	},
+	{
+		.matches = {
+			DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.")
+		},
+	},
+	{}
+};
+
 static int __init i8042_init(void)
 {
 	int err;
 
 	dbg_init();
 
+	/* Intel Apple Macs never have an i8042 controller */
+	if (dmi_check_system(dmi_system_table) > 0)
+		return -ENODEV;
+
 	err = i8042_platform_init();
 	if (err)
 		return err;
-- 
1.6.6




Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2016
retrieving revision 1.2017
diff -u -p -r1.2016 -r1.2017
--- kernel.spec	4 May 2010 14:01:08 -0000	1.2016
+++ kernel.spec	4 May 2010 14:20:02 -0000	1.2017
@@ -841,6 +841,8 @@ Patch12810: ath9k-reorder-ieee80211_free
 
 Patch12820: ibmvscsi-fix-DMA-API-misuse.patch
 
+Patch12830: disable-i8042-check-on-apple-mac.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1532,6 +1534,8 @@ ApplyPatch ath9k-reorder-ieee80211_free_
 
 ApplyPatch ibmvscsi-fix-DMA-API-misuse.patch
 
+ApplyPatch disable-i8042-check-on-apple-mac.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2181,6 +2185,10 @@ fi
 # and build.
 
 %changelog
+* Tue May 4 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-81
+- disable-i8042-check-on-apple-mac.patch: avoid long delay or hang booting
+  on Intel Apple Macs.
+
 * Tue May 4 2010 Kyle McMartin <kyle at redhat.com> 2.6.33.3-80
 - ibmvscsi-fix-DMA-API-misuse.patch (#579454)