mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-09-22 22:11:38 +08:00
ACPI: EC: Re-use boot_ec when possible even when EC_FLAGS_TRUST_DSDT_GPE is set
EC_FLAGS_TRUST_DSDT_GPE only does anything when the: if (boot_ec && ec->command_addr == boot_ec->command_addr && ec->data_addr == boot_ec->data_addr) conditions are all true. Normally acpi_ec_add() would re-use the boot_ec struct acpi_ec in this case. But when the EC_FLAGS_TRUST_DSDT_GPE flag was set the code would continue with a newly allocated (second) struct acpi_ec. There is no reason to use a second struct acpi_ec if all the above checks match. Instead just change boot_ec->gpe to ec->gpe, when the flag is set, similar to how this is already one done for boot_ec->handle. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
f7090e0ef3
commit
81df5f9197
@ -1617,15 +1617,18 @@ static int acpi_ec_add(struct acpi_device *device)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (boot_ec && ec->command_addr == boot_ec->command_addr &&
|
if (boot_ec && ec->command_addr == boot_ec->command_addr &&
|
||||||
ec->data_addr == boot_ec->data_addr &&
|
ec->data_addr == boot_ec->data_addr) {
|
||||||
!EC_FLAGS_TRUST_DSDT_GPE) {
|
|
||||||
/*
|
/*
|
||||||
* Trust PNP0C09 namespace location rather than
|
* Trust PNP0C09 namespace location rather than ECDT ID.
|
||||||
* ECDT ID. But trust ECDT GPE rather than _GPE
|
* But trust ECDT GPE rather than _GPE because of ASUS
|
||||||
* because of ASUS quirks, so do not change
|
* quirks. So do not change boot_ec->gpe to ec->gpe,
|
||||||
* boot_ec->gpe to ec->gpe.
|
* except when the TRUST_DSDT_GPE quirk is set.
|
||||||
*/
|
*/
|
||||||
boot_ec->handle = ec->handle;
|
boot_ec->handle = ec->handle;
|
||||||
|
|
||||||
|
if (EC_FLAGS_TRUST_DSDT_GPE)
|
||||||
|
boot_ec->gpe = ec->gpe;
|
||||||
|
|
||||||
acpi_handle_debug(ec->handle, "duplicated.\n");
|
acpi_handle_debug(ec->handle, "duplicated.\n");
|
||||||
acpi_ec_free(ec);
|
acpi_ec_free(ec);
|
||||||
ec = boot_ec;
|
ec = boot_ec;
|
||||||
|
Loading…
Reference in New Issue
Block a user