summaryrefslogtreecommitdiff
path: root/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-04-19 17:21:50 -0400
committerDavid P <megver83@parabola.nu>2020-04-19 17:21:50 -0400
commit485d3849a4983efaaa506dd3dfeb2e3ac18a1233 (patch)
treef3c1b4c9ede1eb1a6144db271ee43077177781a2 /libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
parent4a117bf4f6f7f3ac952f69e3eb10e2e5f418d42e (diff)
downloadabslibre-485d3849a4983efaaa506dd3dfeb2e3ac18a1233.tar.gz
abslibre-485d3849a4983efaaa506dd3dfeb2e3ac18a1233.tar.bz2
abslibre-485d3849a4983efaaa506dd3dfeb2e3ac18a1233.zip
updpkg: libre/linux-libre 5.6.5-1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch')
-rw-r--r--libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch b/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
new file mode 100644
index 000000000..22201365d
--- /dev/null
+++ b/libre/linux-libre/0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_.patch
@@ -0,0 +1,54 @@
+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: [PATCH 2/2] 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");
+--
+2.26.1
+