On Mon, Jun 21, 2021 at 3:18 AM Zhang Rui <rui.zhang@xxxxxxxxx> wrote: > > On HP Pavilion Gaming Laptop 15-cx0xxx, the ECDT EC and DSDT EC share > the same port addresses but different GPEs. And the DSDT GPE is the > right one to use. > > The current code duplicates DSDT EC with ECDT EC if the port addresses > are the same, and uses ECDT GPE as a result, which breaks this machine. > > Introduce a new quirk for the HP laptop to trust the DSDT GPE, > and avoid duplicating even if the port addresses are the same. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=209989 > Reported-and-tested-by: Shao Fu, Chen <leo881003@xxxxxxxxx> > Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx> > --- > drivers/acpi/ec.c | 21 ++++++++++++++++++++- > 1 file changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c > index 9555c65f2f94..8d8abd0c6cfb 100644 > --- a/drivers/acpi/ec.c > +++ b/drivers/acpi/ec.c > @@ -183,6 +183,7 @@ static struct workqueue_struct *ec_query_wq; > > static int EC_FLAGS_CORRECT_ECDT; /* Needs ECDT port address correction */ > static int EC_FLAGS_IGNORE_DSDT_GPE; /* Needs ECDT GPE as correction setting */ > +static int EC_FLAGS_TRUST_DSDT_GPE; /* Needs DSDT GPE as correction setting */ > static int EC_FLAGS_CLEAR_ON_RESUME; /* Needs acpi_ec_clear() on boot/resume */ > static int EC_FLAGS_FORCE_EC_REG; /* Needs EC _REG evaluated explicitly */ > > @@ -1601,7 +1602,8 @@ static int acpi_ec_add(struct acpi_device *device) > } > > 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 > * ECDT ID. But trust ECDT GPE rather than _GPE > @@ -1836,6 +1838,18 @@ static int ec_honor_ecdt_gpe(const struct dmi_system_id *id) > return 0; > } > > +/* > + * Some ECDTs contain wrong GPE setting, but they share the same port addresses > + * with DSDT EC, don't duplicate the DSDT EC with ECDT EC in this case. > + * https://bugzilla.kernel.org/show_bug.cgi?id=209989 > + */ > +static int ec_honor_dsdt_gpe(const struct dmi_system_id *id) > +{ > + pr_debug("Detected system needing DSDT GPE setting.\n"); > + EC_FLAGS_TRUST_DSDT_GPE = 1; > + return 0; > +} > + > /* > * Some buggy BIOS does not have EC OperationRegion, this results in the > * EC._REG fails to be evaluated when installing the EC address space handler. > @@ -1876,6 +1890,11 @@ static const struct dmi_system_id ec_dmi_table[] __initconst = { > DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), > DMI_MATCH(DMI_PRODUCT_NAME, "X580VD"),}, NULL}, > { > + /* https://bugzilla.kernel.org/show_bug.cgi?id=209989 */ > + ec_honor_dsdt_gpe, "HP Pavilion Gaming Laptop 15-cx0xxx", { > + DMI_MATCH(DMI_SYS_VENDOR, "HP"), > + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Gaming Laptop 15-cx0xxx"),}, NULL}, > + { > ec_clear_on_resume, "Samsung hardware", { > DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD.")}, NULL}, > { > -- Applied as 5.14 material, thanks!
