rpms/kernel/F-8 linux-2.6-acpi_ec_early_init_fix.patch, NONE, 1.1 kernel.spec, 1.341, 1.342

[Chuck Ebbert (cebbert)]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-acpi_ec_early_init_fix.patch 
Log Message:
* Tue Feb 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-133
- ACPI: fix early init of EC (#426480)


linux-2.6-acpi_ec_early_init_fix.patch:

--- NEW FILE linux-2.6-acpi_ec_early_init_fix.patch ---
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.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- kernel.spec	6 Feb 2008 00:48:59 -0000	1.341
+++ kernel.spec	6 Feb 2008 01:22:49 -0000	1.342
@@ -732,6 +732,8 @@
 Patch782: linux-2.6-acpi-cpuidle-2-fix-HP-nx6125-regression.patch
 Patch783: linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch
 Patch784: linux-2.6-acpi-eeepc-hotkey.patch
+Patch785: linux-2.6-acpi_ec_early_init_fix.patch
+
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch820: linux-2.6-compile-fixes.patch
@@ -1410,6 +1412,8 @@
 ApplyPatch linux-2.6-acpi-dont-init-ec-early-with-no-ini.patch
 # Eeepc hotkey driver
 ApplyPatch linux-2.6-acpi-eeepc-hotkey.patch
+# fix EC init fix
+ApplyPatch linux-2.6-acpi_ec_early_init_fix.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -2078,6 +2082,9 @@
 
 
 %changelog
+* Tue Feb 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-133
+- ACPI: fix early init of EC (#426480)
+
 * Tue Feb 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.23.14-132
 - ACPI: fix multiple problems with brightness controls (#427518)