Apply hotfix

3 files changed, 58 insertions, 2 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
+
diff --git a/PKGBUILD b/PKGBUILD
index 8162ec6..4b44a28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,6 +48,7 @@ _gnupkgver=${_pkgver}-gnu
 source=(
   https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig}
+  0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
@@ -66,11 +67,12 @@ b2sums=('921a3836ffbd5ababb897b8d923ab3e97c10c39b8d01060fe41742005f8111b5c2c9e76
         'SKIP'
         '86ff46b8d3505b5c3116d1fa11c60757e172984bb8efbabd4f04b667e287dbcd25f03fb9b62ed993290d079c513616a93094eec97ce3700fdff99400236ead8b'
         'SKIP'
+        '4ffbef601d902432e13c9012e3b46f0321c6277aa36a2bc23b2929e6404d0171e881e4b367d29ac7eb02b6c0d9faa06f152d27fdb88f76aa0c27e68c51b466e8'
         '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
         'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
         '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
-        'e617e416336217aa8868c8baa6371236362f35663a49b974b1decc2701584c9b197cc642080c13248a4cf28e3ba2f9ba70af87b3116ee9ff4480ad6de702d35a'
+        '3d7a17fb7157e3b9fcdc22a205ca954398eb9a941259b05ee58bd479b8ed0a605c64d70f7da48115b13a8b407e08ec98a00236dd0f28be181f34dd0e382ef0c9'
         'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
         'dfa458eea739916884b3a606f845d44bed661589abe89502b3cf35cfa911683e8715b9ce198645f48c57ee3bf4b9cc26ac0722a2e0a6c01d5cd1017ed199a880'
         'SKIP')
@@ -91,6 +93,7 @@ prepare() {
 
   # Hotfixes
   echo "Applying hotfixes"
+  patch -p1 -i ../0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch
   patch -p1 -i ../sphinx-workaround.patch
 
 
diff --git a/config b/config
index b8eb12d..fd83f6a 100644
--- a/config
+++ b/config
@@ -4406,7 +4406,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_FSI=m
 # end of I2C Hardware Bus support
 
-# CONFIG_I2C_STUB is not set
+CONFIG_I2C_STUB=m
 CONFIG_I2C_SLAVE=y
 CONFIG_I2C_SLAVE_EEPROM=m
 # CONFIG_I2C_DEBUG_CORE is not set