diff options
| -rw-r--r-- | 0002-Revert-ACPI-EC-Do-not-clear-boot_ec_is_ecdt-in-acpi_ec_add.patch | 53 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | config | 2 |
3 files changed, 59 insertions, 3 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 + @@ -23,7 +23,7 @@ _gccpatchker='5.5' else pkgver=${_supver}.${_majver}.${_minver} fi -pkgrel=1 +pkgrel=2 pkgdesc='Linux' url='https://kernel.org' arch=(x86_64) @@ -38,6 +38,7 @@ _srcname=linux-${pkgver} source=( https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign} 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + 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 @@ -53,11 +54,12 @@ validpgpkeys=( b2sums=('92d4ea253eb70a77ea6d891b34406d5c78422d491ea66946e87fb4f1e91b786fd67fb5bf38bc5883f929cb16b916fea2b600d4223457e603c5ca8f1ea5ba8652' 'SKIP' 'ab1fb19c67d4c107f75767581c33d9c1458b4d9fdb88f4adb41d30a36f5a2f95f1c48ef079eb87e1e6e8ce2f98b293195cb2c0f2a8ec975aa817453289158c6e' + '4ffbef601d902432e13c9012e3b46f0321c6277aa36a2bc23b2929e6404d0171e881e4b367d29ac7eb02b6c0d9faa06f152d27fdb88f76aa0c27e68c51b466e8' '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e' 'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f' '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd' 'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a' - '54f82139da9b9b53121e1a7da00f94ac5c0f4c16e5f68a4d4a6ec6d96b3c261c0060280aba7e555f8a24414f41d217ef8a953221654f48a317d66766f28b802e' + '3c9a402745436534c466f9b0e3cb0b0a5c108de158813a6d641f476bce8b4d83138ea3aa57c56553161f8743cc3513429bd6837e6bc7fe4bb2306be964d70158' 'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95') #export KBUILD_BUILD_HOST=arc4linux @@ -77,6 +79,7 @@ prepare() { # Hotfixes echo "Applying hotfixes" patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch + 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 @@ -4460,7 +4460,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 |