Attachment 189134 Details for Bug 334005

[patch] Enable EC region handlers before bus_scan

ec_enable_before_scan.patch (text/plain), 2.50 KB, created by Alexey Starikovskiy on 2008-01-03 10:17:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Starikovskiy

Created: 2008-01-03 10:17:32 UTC

Size: 2.50 KB

patch

obsolete

>ACPI: EC: Enable boot EC before bus_scan
>
>From: Alexey Starikovskiy <astarikovskiy@suse.de>
>
>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@suse.de>
>---
>
> drivers/acpi/ec.c   |   14 +++++++++++++-
> drivers/acpi/scan.c |    6 ++++++
> 2 files changed, 19 insertions(+), 1 deletions(-)
>
>Index: linux-2.6.22/drivers/acpi/ec.c
>===================================================================
>--- linux-2.6.22.orig/drivers/acpi/ec.c	2008-01-03 13:10:59.000000000 +0300
>+++ linux-2.6.22/drivers/acpi/ec.c	2008-01-03 13:13:05.000000000 +0300
>@@ -807,6 +807,17 @@
> 	return AE_CTRL_TERMINATE;
> }
> 
>+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;
>@@ -832,11 +843,15 @@
> 		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
> 		status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
> 						boot_ec, NULL);
>- 		/* Check that acpi_get_devices actually find something */
>- 		if (ACPI_FAILURE(status) || !boot_ec->handle)
>- 			goto error;
>-		if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
>+		/* Check that acpi_get_devices actually find something */
>+		if (ACPI_FAILURE(status) || !boot_ec->handle)
> 			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)))
>+			return -ENODEV;
> 	}
> 
> 	ret = ec_install_handlers(boot_ec);
>Index: linux-2.6.22/drivers/acpi/scan.c
>===================================================================
>--- linux-2.6.22.orig/drivers/acpi/scan.c	2007-07-09 03:32:17.000000000 +0400
>+++ linux-2.6.22/drivers/acpi/scan.c	2008-01-03 13:11:42.000000000 +0300
>@@ -1380,6 +1380,8 @@
> 	return result;
> }
> 
>+int __init acpi_boot_ec_enable(void);
>+
> static int __init acpi_scan_init(void)
> {
> 	int result;
>@@ -1411,6 +1413,10 @@
> 	 * 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);
>

Actions: View | Diff

Attachments on bug 334005: 189106 | 189108 | 189134 | 189358 | 189806