rpms/kernel/F-8 linux-2.6-acpi_ec_early_init_fix.patch, 1.2, 1.3 kernel.spec, 1.380, 1.381 linux-2.6-acpi-disable-gpe-fix.patch, 1.1, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10121

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi_ec_early_init_fix.patch 
Removed Files:
	linux-2.6-acpi-disable-gpe-fix.patch 
Log Message:
* Wed Mar 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-35
- Revert 2.6.24 ACPI change that broke some notebooks. (#432477)


linux-2.6-acpi_ec_early_init_fix.patch:

Index: linux-2.6-acpi_ec_early_init_fix.patch
===================================================================
RCS file: linux-2.6-acpi_ec_early_init_fix.patch
diff -N linux-2.6-acpi_ec_early_init_fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ linux-2.6-acpi_ec_early_init_fix.patch	12 Mar 2008 22:14:19 -0000	1.3
@@ -0,0 +1,81 @@
+Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c04209a7948b95e8c52084e8595e74e9428653d3
+Commit:     c04209a7948b95e8c52084e8595e74e9428653d3
+Parent:     e697789d64f8748cb219d7f5c413c512953802cc
+Author:     Alexey Starikovskiy <astarikovskiy at suse.de>
+AuthorDate: Tue Jan 1 14:12:55 2008 -0500
+Committer:  Len Brown <len.brown at intel.com>
+CommitDate: Tue Jan 1 14:12:55 2008 -0500
+
+    ACPI: EC: Enable boot EC before bus_scan
+    
+    Some _STA methods called during bus_scan() might require EC region handler,
+    which might be enabled later in the scan.
+    Enable it explicitly before scan to avoid errors.
+    
+    Reference: http://bugzilla.kernel.org/show_bug.cgi?id=9627
+    
+    Signed-off-by: Alexey Starikovskiy <astarikovskiy at suse.de>
+    Signed-off-by: Len Brown <len.brown at intel.com>
+---
+ drivers/acpi/ec.c   |   14 +++++++++++++-
+ drivers/acpi/scan.c |    6 ++++++
+ 2 files changed, 19 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
+index d411017..97dc161 100644
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -892,6 +892,17 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
+ 	return 0;
+ }
+ 
++int __init acpi_boot_ec_enable(void)
++{
++	if (!boot_ec || boot_ec->handlers_installed)
++		return 0;
++	if (!ec_install_handlers(boot_ec)) {
++		first_ec = boot_ec;
++		return 0;
++	}
++	return -EFAULT;
++}
++
+ int __init acpi_ec_ecdt_probe(void)
+ {
+ 	int ret;
+@@ -924,9 +935,10 @@ int __init acpi_ec_ecdt_probe(void)
+ 			goto error;
+ 		/* We really need to limit this workaround, the only ASUS,
+ 		 * which needs it, has fake EC._INI method, so use it as flag.
++		 * Keep boot_ec struct as it will be needed soon.
+ 		 */
+ 		if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
+-			goto error;
++			return -ENODEV;
+ 	}
+ 
+ 	ret = ec_install_handlers(boot_ec);
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index 5b4d462..cbfe9ae 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -1449,6 +1449,8 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
+ 	return result;
+ }
+ 
++int __init acpi_boot_ec_enable(void);
++
+ static int __init acpi_scan_init(void)
+ {
+ 	int result;
+@@ -1480,6 +1482,10 @@ static int __init acpi_scan_init(void)
+ 	 * Enumerate devices in the ACPI namespace.
+ 	 */
+ 	result = acpi_bus_scan_fixed(acpi_root);
++
++	/* EC region might be needed at bus_scan, so enable it now */
++	acpi_boot_ec_enable();
++
+ 	if (!result)
+ 		result = acpi_bus_scan(acpi_root, &ops);
+ 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- kernel.spec	12 Mar 2008 20:25:04 -0000	1.380
+++ kernel.spec	12 Mar 2008 22:14:19 -0000	1.381
@@ -677,7 +677,7 @@
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
 Patch761: linux-2.6-acpi-video-backlight-rationalize.patch
 Patch763: linux-2.6-acpi-video-fix-multiple-busses.patch
-#Patch766: linux-2.6-acpi-disable-gpe-fix.patch
+Patch767: linux-2.6-acpi_ec_early_init_fix.patch
 Patch784: linux-2.6-acpi-eeepc-hotkey.patch
 
 Patch820: linux-2.6-compile-fixes.patch
@@ -1256,9 +1256,8 @@
 # fix multiple ACPI brightness problems (#427518)
 ApplyPatch linux-2.6-acpi-video-backlight-rationalize.patch
 ApplyPatch linux-2.6-acpi-video-fix-multiple-busses.patch
-# disable stray gpe properly
-# need to find out why this is broken
-#ApplyPatch linux-2.6-acpi-disable-gpe-fix.patch
+# revert EC change in 2.6.24 that broke some notebooks (#432477)
+ApplyPatch linux-2.6-acpi_ec_early_init_fix.patch -R
 # Eeepc hotkey driver
 ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch
 
@@ -1913,6 +1912,9 @@
 
 
 %changelog
+* Wed Mar 12 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-35
+- Revert 2.6.24 ACPI change that broke some notebooks. (#432477)
+
 * Tue Mar 11 2008 John W. Linville <linville at redhat.com> 2.6.24.3-34
 - rt2x00:correct rx packet length for USB devices
 - make b43_mac_{enable,suspend}() static


--- linux-2.6-acpi-disable-gpe-fix.patch DELETED ---