From: Greg Kroah-Hartman Date: Wed, 16 Mar 2022 16:39:27 +0000 (+0100) Subject: drop input-goodix-workaround-cherry-trail-devices-with-a-.patch from 5.10 and 5.15 X-Git-Tag: v5.4.186~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7ab799fd7228f6279e7caffaaa3317da5e136c0;p=thirdparty%2Fkernel%2Fstable-queue.git drop input-goodix-workaround-cherry-trail-devices-with-a-.patch from 5.10 and 5.15 --- diff --git a/queue-5.10/input-goodix-workaround-cherry-trail-devices-with-a-.patch b/queue-5.10/input-goodix-workaround-cherry-trail-devices-with-a-.patch deleted file mode 100644 index f1a14d96436..00000000000 --- a/queue-5.10/input-goodix-workaround-cherry-trail-devices-with-a-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9a661dc7a57c79191547af51f0f99f502cdd4a8b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 28 Feb 2022 22:53:12 -0800 -Subject: Input: goodix - workaround Cherry Trail devices with a bogus ACPI - Interrupt() resource - -From: Hans de Goede - -[ Upstream commit d982992669733dd75520000c6057d8ee0725a363 ] - -ACPI/x86 devices with a Cherry Trail SoC should have a GpioInt + a regular -GPIO ACPI resource in their ACPI tables. - -Some CHT devices have a bug, where the also is bogus interrupt resource -(likely copied from a previous Bay Trail based generation of the device). - -The i2c-core-acpi code will assign the bogus, non-working, interrupt -resource to client->irq. Add a workaround to fix this up. - -BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2043960 -Signed-off-by: Hans de Goede -Link: https://lore.kernel.org/r/20220228111613.363336-1-hdegoede@redhat.com -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/touchscreen/goodix.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 5fc789f717c8..f6c92365d327 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -782,7 +782,7 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) - const struct acpi_gpio_mapping *gpio_mapping = NULL; - struct device *dev = &ts->client->dev; - LIST_HEAD(resources); -- int ret; -+ int irq, ret; - - ts->gpio_count = 0; - ts->gpio_int_idx = -1; -@@ -795,6 +795,20 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) - - acpi_dev_free_resource_list(&resources); - -+ /* -+ * CHT devices should have a GpioInt + a regular GPIO ACPI resource. -+ * Some CHT devices have a bug (where the also is bogus Interrupt -+ * resource copied from a previous BYT based generation). i2c-core-acpi -+ * will use the non-working Interrupt resource, fix this up. -+ */ -+ if (soc_intel_is_cht() && ts->gpio_count == 2 && ts->gpio_int_idx != -1) { -+ irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0); -+ if (irq > 0 && irq != ts->client->irq) { -+ dev_warn(dev, "Overriding IRQ %d -> %d\n", ts->client->irq, irq); -+ ts->client->irq = irq; -+ } -+ } -+ - if (ts->gpio_count == 2 && ts->gpio_int_idx == 0) { - ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_GPIO; - gpio_mapping = acpi_goodix_int_first_gpios; --- -2.34.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 850626b6281..a2fb8b3cf9f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -12,7 +12,6 @@ mips-smp-fill-in-sibling-and-core-maps-earlier.patch arm-9178-1-fix-unmet-dependency-on-bitreverse-for-ha.patch can-rcar_canfd-rcar_canfd_channel_probe-register-the.patch atm-firestream-check-the-return-value-of-ioremap-in-.patch -input-goodix-workaround-cherry-trail-devices-with-a-.patch iwlwifi-don-t-advertise-twt-support.patch drm-vrr-set-vrr-capable-prop-only-if-it-is-attached-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch diff --git a/queue-5.15/input-goodix-workaround-cherry-trail-devices-with-a-.patch b/queue-5.15/input-goodix-workaround-cherry-trail-devices-with-a-.patch deleted file mode 100644 index 7e41dcb7f91..00000000000 --- a/queue-5.15/input-goodix-workaround-cherry-trail-devices-with-a-.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 474f5d9fca167a51f6ec724aea317f706ef78ede Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 28 Feb 2022 22:53:12 -0800 -Subject: Input: goodix - workaround Cherry Trail devices with a bogus ACPI - Interrupt() resource - -From: Hans de Goede - -[ Upstream commit d982992669733dd75520000c6057d8ee0725a363 ] - -ACPI/x86 devices with a Cherry Trail SoC should have a GpioInt + a regular -GPIO ACPI resource in their ACPI tables. - -Some CHT devices have a bug, where the also is bogus interrupt resource -(likely copied from a previous Bay Trail based generation of the device). - -The i2c-core-acpi code will assign the bogus, non-working, interrupt -resource to client->irq. Add a workaround to fix this up. - -BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2043960 -Signed-off-by: Hans de Goede -Link: https://lore.kernel.org/r/20220228111613.363336-1-hdegoede@redhat.com -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/touchscreen/goodix.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c -index 5051a1766aac..18021ae8183d 100644 ---- a/drivers/input/touchscreen/goodix.c -+++ b/drivers/input/touchscreen/goodix.c -@@ -784,7 +784,7 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) - const struct acpi_gpio_mapping *gpio_mapping = NULL; - struct device *dev = &ts->client->dev; - LIST_HEAD(resources); -- int ret; -+ int irq, ret; - - ts->gpio_count = 0; - ts->gpio_int_idx = -1; -@@ -797,6 +797,20 @@ static int goodix_add_acpi_gpio_mappings(struct goodix_ts_data *ts) - - acpi_dev_free_resource_list(&resources); - -+ /* -+ * CHT devices should have a GpioInt + a regular GPIO ACPI resource. -+ * Some CHT devices have a bug (where the also is bogus Interrupt -+ * resource copied from a previous BYT based generation). i2c-core-acpi -+ * will use the non-working Interrupt resource, fix this up. -+ */ -+ if (soc_intel_is_cht() && ts->gpio_count == 2 && ts->gpio_int_idx != -1) { -+ irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0); -+ if (irq > 0 && irq != ts->client->irq) { -+ dev_warn(dev, "Overriding IRQ %d -> %d\n", ts->client->irq, irq); -+ ts->client->irq = irq; -+ } -+ } -+ - if (ts->gpio_count == 2 && ts->gpio_int_idx == 0) { - ts->irq_pin_access_method = IRQ_PIN_ACCESS_ACPI_GPIO; - gpio_mapping = acpi_goodix_int_first_gpios; --- -2.34.1 - diff --git a/queue-5.15/kselftest-vm-fix-tests-build-with-old-libc.patch b/queue-5.15/kselftest-vm-fix-tests-build-with-old-libc.patch index 68f338ff368..cfadedb6363 100644 --- a/queue-5.15/kselftest-vm-fix-tests-build-with-old-libc.patch +++ b/queue-5.15/kselftest-vm-fix-tests-build-with-old-libc.patch @@ -27,11 +27,9 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - tools/testing/selftests/vm/userfaultfd.c | 1 + + tools/testing/selftests/vm/userfaultfd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c -index 81690f1737c8..138b011c667e 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -46,6 +46,7 @@ @@ -42,6 +40,3 @@ index 81690f1737c8..138b011c667e 100644 #include #include #include --- -2.34.1 - diff --git a/queue-5.15/series b/queue-5.15/series index d6aa9601ff7..742d036bbde 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -14,7 +14,6 @@ arm-9178-1-fix-unmet-dependency-on-bitreverse-for-ha.patch bluetooth-hci_core-fix-leaking-sent_cmd-skb.patch can-rcar_canfd-rcar_canfd_channel_probe-register-the.patch atm-firestream-check-the-return-value-of-ioremap-in-.patch -input-goodix-workaround-cherry-trail-devices-with-a-.patch iwlwifi-don-t-advertise-twt-support.patch drm-vrr-set-vrr-capable-prop-only-if-it-is-attached-.patch nl80211-update-bss-channel-on-channel-switch-for-p2p.patch diff --git a/queue-5.16/kselftest-vm-fix-tests-build-with-old-libc.patch b/queue-5.16/kselftest-vm-fix-tests-build-with-old-libc.patch index c5f0d457f8b..72dcf42fe90 100644 --- a/queue-5.16/kselftest-vm-fix-tests-build-with-old-libc.patch +++ b/queue-5.16/kselftest-vm-fix-tests-build-with-old-libc.patch @@ -27,11 +27,9 @@ Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- - tools/testing/selftests/vm/userfaultfd.c | 1 + + tools/testing/selftests/vm/userfaultfd.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c -index 9354a5e0321c..3f7f5bd4e4c0 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -46,6 +46,7 @@ @@ -42,6 +40,3 @@ index 9354a5e0321c..3f7f5bd4e4c0 100644 #include #include #include --- -2.34.1 -