Attachment 189806 Details for Bug 334005

[patch] updated patch from bug 9627

xx.patch (text/plain), 2.86 KB, created by Alexey Starikovskiy on 2008-01-08 21:26:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Starikovskiy

Created: 2008-01-08 21:26:05 UTC

Size: 2.86 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/drivers/acpi/ec.c
>===================================================================
>--- linux.orig/drivers/acpi/ec.c
>+++ linux/drivers/acpi/ec.c
>@@ -108,6 +108,7 @@ static struct acpi_ec {
> 	atomic_t query_pending;
> 	atomic_t event_count;
> 	wait_queue_head_t wait;
>+	u8 handlers_installed;
> } *boot_ec, *first_ec;
> 
> /* --------------------------------------------------------------------------
>@@ -708,6 +709,8 @@ ec_parse_io_ports(struct acpi_resource *
> static int ec_install_handlers(struct acpi_ec *ec)
> {
> 	acpi_status status;
>+	if (ec->handlers_installed)
>+		return 0;
> 	status = acpi_install_gpe_handler(NULL, ec->gpe,
> 					  ACPI_GPE_EDGE_TRIGGERED,
> 					  &acpi_ec_gpe_handler, ec);
>@@ -728,7 +731,7 @@ static int ec_install_handlers(struct ac
> 
> 	/* EC is fully operational, allow queries */
> 	atomic_set(&ec->query_pending, 0);
>-
>+	ec->handlers_installed = 1;
> 	return 0;
> }
> 
>@@ -779,7 +782,7 @@ static int acpi_ec_stop(struct acpi_devi
> 	status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
> 	if (ACPI_FAILURE(status))
> 		return -ENODEV;
>-
>+	ec->handlers_installed = 0;
> 	return 0;
> }
> 
>@@ -811,6 +814,17 @@ ec_parse_device(acpi_handle handle, u32 
> 	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;
>@@ -840,7 +854,7 @@ int __init acpi_ec_ecdt_probe(void)
>  		if (ACPI_FAILURE(status) || !boot_ec->handle)
>  			goto error;
> 		if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &x)))
>-			goto error;
>+			return -ENODEV;
> 	}
> 
> 	ret = ec_install_handlers(boot_ec);
>Index: linux/drivers/acpi/scan.c
>===================================================================
>--- linux.orig/drivers/acpi/scan.c
>+++ linux/drivers/acpi/scan.c
>@@ -1515,6 +1515,8 @@ static int acpi_bus_scan_fixed(struct ac
> 	return result;
> }
> 
>+int __init acpi_boot_ec_enable(void);
>+
> static int __init acpi_scan_init(void)
> {
> 	int result;
>@@ -1546,6 +1548,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);
>

Actions: View | Diff

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