diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-04-18 20:56:44 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-04-18 20:56:44 -0700 |
| commit | b02cba95f8644f1774a917999f700e80100a7a84 (patch) | |
| tree | 8b949d38ce86e2cbc424d2f3c66eb2cc69e3d1ea /0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch | |
| parent | Updated to 5.6.5 (diff) | |
| download | linux-libre-b02cba95f8644f1774a917999f700e80100a7a84.tar.xz | |
Add hotfix
Diffstat (limited to '0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch')
| -rw-r--r-- | 0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch b/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch new file mode 100644 index 0000000..b30143c --- /dev/null +++ b/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch @@ -0,0 +1,53 @@ +From e5016d0b5460c3bed8f78033723ad22775db7725 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Sat, 18 Apr 2020 11:29:04 +0200 +Subject: Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f which is +commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream. + +Rafael writes: + It has not been marked for -stable or otherwise requested to be + included AFAICS. Also it depends on other mainline commits that + have not been included into 5.6.5. + +Reported-by: Toralf Förster <toralf.foerster@gmx.de> +Reported-by: Rafael J. Wysocki <rafael@kernel.org> +Cc: Sasha Levin <sashal@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/acpi/ec.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c +index 29b8fa618a02..35dd2f1fb0e6 100644 +--- a/drivers/acpi/ec.c ++++ b/drivers/acpi/ec.c +@@ -1646,6 +1646,7 @@ 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) { ++ boot_ec_is_ecdt = false; + /* + * Trust PNP0C09 namespace location rather than + * ECDT ID. But trust ECDT GPE rather than _GPE +@@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_device *device) + + if (ec == boot_ec) + acpi_handle_info(boot_ec->handle, +- "Boot %s EC initialization complete\n", ++ "Boot %s EC used to handle transactions and events\n", + boot_ec_is_ecdt ? "ECDT" : "DSDT"); + +- acpi_handle_info(ec->handle, +- "EC: Used to handle transactions and events\n"); +- + device->driver_data = ec; + + ret = !!request_region(ec->data_addr, 1, "EC data"); +-- +cgit v1.2.3-1-gf6bb5 + |