mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
ACPI fix for v4.7-rc3
A recently introduced boot regression related to the ACPI EC initialization is addressed by restoring the previous behavior (Lv Zheng). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJXWgXgAAoJEILEb/54YlRxfSEP/1pn12280O8TDtMcFtVfoXae ub3j0LyA7+zofiHDFtSuyFeLWoYuMfTrpa6FJ1NKFpaUP1gtWrHOuOHRz4D8htoT yglJXRdKdh4lEUiN0PN9YjQvLBpynkzlFNQjGWpFND/jyH4MUvE0NQFyXDl1fwUv uaw6Zgj5cyqTJFVZZEWXQbjXiK52dQvr6h6hAo/cFtIgiRGxnl24GTA68UVIBE5Y EtDOw6V22CB08MG5eRb3lgk6m3u2LdSaTHJ+/vJeOJblm2MAIISslW5VkTrFB+Xg YXL3dJUiQ0ZWnTKU6hn8JmoTzBOmQ0odyvuxx62CJFOHPV5S9FunrbPmrPZT5lTn FskibLBU5GoJ4AAv3Z+frXILggh4poLib17p2rAVyvzjTzxNV7OCvK05meZy4e+g 01qc5pzKyIXAnaqWY52OjSghOm1CssH/E39W59AWlx0M/FGLYk2N/suMxAKhkVbE E1X/uU1CbZ3ajpm7OTJLOAO4YJQa3oy5ceh0XuKE/v59GVdIJPmFI4weTfK2nptM LsOCQB58BhxeXl0ziXmnqOu1mSmDStQU0MXMKZMLZ9DXxEl9HljTR3C0L24D3m8O 6Svvc04YWzurNuLcKqoFfQIUZxjd5hQVcXPj119igiAdh6kvEfY9Gm6hjF5lRRm/ wQ14cSsWWGD0MOl05WYW =bb/0 -----END PGP SIGNATURE----- Merge tag 'acpi-4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm Pull ACPI fix from Rafael Wysocki: "A recently introduced boot regression related to the ACPI EC initialization is addressed by restoring the previous behavior (Lv Zheng)" * tag 'acpi-4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / EC: Fix a boot EC regresion by restoring boot EC support for the DSDT EC
This commit is contained in:
commit
f758bbd470
3 changed files with 24 additions and 9 deletions
|
@ -1051,7 +1051,7 @@ static int __init acpi_bus_init(void)
|
||||||
* Maybe EC region is required at bus_scan/acpi_get_devices. So it
|
* Maybe EC region is required at bus_scan/acpi_get_devices. So it
|
||||||
* is necessary to enable it as early as possible.
|
* is necessary to enable it as early as possible.
|
||||||
*/
|
*/
|
||||||
acpi_boot_ec_enable();
|
acpi_ec_dsdt_probe();
|
||||||
|
|
||||||
printk(KERN_INFO PREFIX "Interpreter enabled\n");
|
printk(KERN_INFO PREFIX "Interpreter enabled\n");
|
||||||
|
|
||||||
|
|
|
@ -1446,10 +1446,30 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
|
||||||
return AE_OK;
|
return AE_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int __init acpi_boot_ec_enable(void)
|
static const struct acpi_device_id ec_device_ids[] = {
|
||||||
|
{"PNP0C09", 0},
|
||||||
|
{"", 0},
|
||||||
|
};
|
||||||
|
|
||||||
|
int __init acpi_ec_dsdt_probe(void)
|
||||||
{
|
{
|
||||||
if (!boot_ec)
|
acpi_status status;
|
||||||
|
|
||||||
|
if (boot_ec)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Finding EC from DSDT if there is no ECDT EC available. When this
|
||||||
|
* function is invoked, ACPI tables have been fully loaded, we can
|
||||||
|
* walk namespace now.
|
||||||
|
*/
|
||||||
|
boot_ec = make_acpi_ec();
|
||||||
|
if (!boot_ec)
|
||||||
|
return -ENOMEM;
|
||||||
|
status = acpi_get_devices(ec_device_ids[0].id,
|
||||||
|
ec_parse_device, boot_ec, NULL);
|
||||||
|
if (ACPI_FAILURE(status) || !boot_ec->handle)
|
||||||
|
return -ENODEV;
|
||||||
if (!ec_install_handlers(boot_ec)) {
|
if (!ec_install_handlers(boot_ec)) {
|
||||||
first_ec = boot_ec;
|
first_ec = boot_ec;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1457,11 +1477,6 @@ int __init acpi_boot_ec_enable(void)
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct acpi_device_id ec_device_ids[] = {
|
|
||||||
{"PNP0C09", 0},
|
|
||||||
{"", 0},
|
|
||||||
};
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/*
|
/*
|
||||||
* Some EC firmware variations refuses to respond QR_EC when SCI_EVT is not
|
* Some EC firmware variations refuses to respond QR_EC when SCI_EVT is not
|
||||||
|
|
|
@ -181,7 +181,7 @@ typedef int (*acpi_ec_query_func) (void *data);
|
||||||
|
|
||||||
int acpi_ec_init(void);
|
int acpi_ec_init(void);
|
||||||
int acpi_ec_ecdt_probe(void);
|
int acpi_ec_ecdt_probe(void);
|
||||||
int acpi_boot_ec_enable(void);
|
int acpi_ec_dsdt_probe(void);
|
||||||
void acpi_ec_block_transactions(void);
|
void acpi_ec_block_transactions(void);
|
||||||
void acpi_ec_unblock_transactions(void);
|
void acpi_ec_unblock_transactions(void);
|
||||||
void acpi_ec_unblock_transactions_early(void);
|
void acpi_ec_unblock_transactions_early(void);
|
||||||
|
|
Loading…
Reference in a new issue