Update patches for v6.5

Changes:
 - Replace temporary serial-port suspend fix with proper one
 - Rebase onto v6.5.6

Links:
 - kernel: 52575b42ef
This commit is contained in:
Maximilian Luz 2023-10-07 12:51:25 +02:00
parent f210410514
commit e59f294e00
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
14 changed files with 78 additions and 73 deletions

View file

@ -1,4 +1,4 @@
From 12a5bbe01502724f70dd634639ae1abbb438547c Mon Sep 17 00:00:00 2001
From d83d6478931989d4a211372e92c44b4020be48de Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 18 Oct 2020 16:42:44 +0900
Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI

View file

@ -1,4 +1,4 @@
From 49318ff022593bd9ee50d006ef084652a01c8df8 Mon Sep 17 00:00:00 2001
From 8f3df38a8fb044dc63d15d1aa7eeec13a0ec4cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 3 Nov 2020 13:28:04 +0100
Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface
@ -165,7 +165,7 @@ index d6ff964aec5b..5d30ae39d65e 100644
--
2.42.0
From 727fa45140fe1e6ce389f7698ca7b67a67e8781f Mon Sep 17 00:00:00 2001
From 15d63e166f619c8a5baf139e376fe2285f4c2ff6 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Sun, 4 Oct 2020 00:11:49 +0900
Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+
@ -320,7 +320,7 @@ index 5d30ae39d65e..c14eb56eb911 100644
--
2.42.0
From e265bfd909c9f17867eb68d6446f238a450d8e78 Mon Sep 17 00:00:00 2001
From d91266ba1b8afcdcc2a628e9f1bb400c86286bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 25 Mar 2021 11:33:02 +0100
Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell

View file

@ -1,4 +1,4 @@
From e07ae09261bc155f332dca703a12f3ce2891f35f Mon Sep 17 00:00:00 2001
From a77ffb3a1080facd893088070bf6e5474fd9ee58 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 27 Feb 2021 00:45:52 +0100
Subject: [PATCH] ath10k: Add module parameters to override board files

View file

@ -1,4 +1,4 @@
From eb9f77870820a66f7a5e4585f6f2b33b354615ca Mon Sep 17 00:00:00 2001
From 45e0d4511653ae109942a4250ef05c2f3661ce18 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 30 Jul 2020 13:21:53 +0200
Subject: [PATCH] misc: mei: Add missing IPTS device IDs
@ -36,7 +36,7 @@ index 676d566f38dd..6b37dd1f8b2a 100644
--
2.42.0
From b01fede6915508acdbdec41c29fd3c8740b6f082 Mon Sep 17 00:00:00 2001
From 3a7f8d3d21d3b841607e8af4437b16fd677f5679 Mon Sep 17 00:00:00 2001
From: Liban Hannan <liban.p@gmail.com>
Date: Tue, 12 Apr 2022 23:31:12 +0100
Subject: [PATCH] iommu: ipts: use IOMMU passthrough mode for IPTS
@ -136,7 +136,7 @@ index 5c8c5cdc36cf..fc4799415c3c 100644
--
2.42.0
From b9358540674348b39d248a02ec314ba8ad6016d9 Mon Sep 17 00:00:00 2001
From c504c6923f2b5239436f990f443e0af9d7462c4a Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:00:59 +0100
Subject: [PATCH] hid: Add support for Intel Precise Touch and Stylus

View file

@ -1,4 +1,4 @@
From 2f4527f977e57fba5d278825215d51730a7623dc Mon Sep 17 00:00:00 2001
From 15bcb09157266ad8e90e5ee5f954a9760ac40e4f Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:03:38 +0100
Subject: [PATCH] iommu: intel: Disable source id verification for ITHC
@ -39,7 +39,7 @@ index 08f56326e2f8..75218b38995c 100644
--
2.42.0
From 1f0c9d3f6c22e8136358dc366f61ca4d20c0377c Mon Sep 17 00:00:00 2001
From 4d815045b207589057c1dfc6eba542d232e9654b Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 11 Dec 2022 12:10:54 +0100
Subject: [PATCH] hid: Add support for Intel Touch Host Controller

View file

@ -1,49 +1,54 @@
From b81f708b2a9b753fbd5f785be2a30c71befec1a9 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 3 Oct 2023 02:15:04 +0200
Subject: [PATCH] wip! serial: core: Disable runtime-suspend by default
From 89b8b8c121fe201862929709d451fecb24947676 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 5 Oct 2023 10:56:42 +0300
Subject: [PATCH] serial: core: Fix checks for tx runtime PM state
Commit 84a9582fd203 ("serial: core: Start managing serial controllers to
enable runtime PM"), broke suspend on various Microsoft Surface devices.
In particular, devices with the Surface Aggregator Module (SAM) EC
connected via the Surface Serial Hub (SSH), a UART device.
Maximilian reported that surface_serial_hub serdev tx does not work during
system suspend. During system suspend, runtime PM gets disabled in
__device_suspend_late(), and tx is unable to wake-up the serial core port
device that we use to check if tx is safe to start. Johan summarized the
regression noting that serdev tx no longer always works as earlier when the
serdev device is runtime PM active.
The core issue is that any UART communication is blocked when the UART
port is in runtime suspend. Data sent during that time will be cached
and transferred only after the device has been runtime-resumed.
Unfortunately, any runtime PM transitions are blocked right before
entering normal suspend and only unblocked after resuming. This means,
that if we enter normal suspend when the port is runtime suspended, any
communication will be blocked until the device resumes.
The serdev device and the serial core controller devices are siblings of
the serial port hardware device. The runtime PM usage count from serdev
device does not propagate to the serial core device siblings, it only
propagates to the parent.
Unfortunately, however, we need to tell the SAM EC when we are
suspending and resuming to quiesce / re-enable events, turn off the
keyboard backlight, and transition it to a lower power mode. This is
currently done in prepare()/complete() and suspend()/resume(). With the
commit mentioned above, these operations now time out, causing suspend
to fail.
In addition to the tx issue for suspend, testing for the serial core port
device can cause an unnecessary delay in enabling tx while waiting for the
serial core port device to wake-up. The serial core port device wake-up is
only needed to flush pending tx when the serial port hardware device was
in runtime PM suspended state.
As a temporary workaround: Disable runtime PM on the UART ports.
To fix the regression, we need to check the runtime PM state of the parent
serial port hardware device for tx instead of the serial core port device.
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
As the serial port device drivers may or may not implement runtime PM, we
need to also add a check for pm_runtime_enabled().
Reported-by: Maximilian Luz <luzmaximilian@gmail.com>
Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Patchset: surface-sam
---
drivers/tty/serial/serial_port.c | 2 ++
1 file changed, 2 insertions(+)
drivers/tty/serial/serial_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index 862423237007..6ceacea5e790 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -55,6 +55,8 @@ static int serial_port_probe(struct device *dev)
pm_runtime_set_autosuspend_delay(dev, SERIAL_PORT_AUTOSUSPEND_DELAY_MS);
pm_runtime_use_autosuspend(dev);
+ pm_runtime_forbid(dev);
+
return 0;
}
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 831d033611e6..e429ac42a12e 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -157,7 +157,7 @@ static void __uart_start(struct tty_struct *tty)
* enabled, serial_port_runtime_resume() calls start_tx() again
* after enabling the device.
*/
- if (pm_runtime_active(&port_dev->dev))
+ if (!pm_runtime_enabled(port->dev) || pm_runtime_active(port->dev))
port->ops->start_tx(port);
pm_runtime_mark_last_busy(&port_dev->dev);
pm_runtime_put_autosuspend(&port_dev->dev);
--
2.42.0

View file

@ -1,4 +1,4 @@
From 57a9790031ee4e702a633a58e7fc1e0923457975 Mon Sep 17 00:00:00 2001
From ef087e2d75b52e727db2e413fdbdc596e2babadb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jul 2020 17:19:53 +0200
Subject: [PATCH] i2c: acpi: Implement RawBytes read access
@ -110,7 +110,7 @@ index d6037a328669..a290ebc77aea 100644
--
2.42.0
From 0db288ee722c357b3c786102e3d3d54bd594cec3 Mon Sep 17 00:00:00 2001
From ec8fe494052629fc2a9f5234c674f42e42aee254 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 13 Feb 2021 16:41:18 +0100
Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch

View file

@ -1,4 +1,4 @@
From c53835c377fe5311e26e6c4a43875c2fe05a9988 Mon Sep 17 00:00:00 2001
From b595029ce12d05babb051893a3b5ad8a0555a553 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:05:09 +1100
Subject: [PATCH] Input: soc_button_array - support AMD variant Surface devices
@ -75,7 +75,7 @@ index e79f5497948b..2bddbe6e9ea4 100644
--
2.42.0
From 62906484583876cc396a55712f3c9483879b72ac Mon Sep 17 00:00:00 2001
From 701b3618008b9aad7c8f480e781a3fd412b169f0 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Tue, 5 Oct 2021 00:22:57 +1100
Subject: [PATCH] platform/surface: surfacepro3_button: don't load on amd

View file

@ -1,4 +1,4 @@
From ae85c1b98b374a567945912d45deaeb71f803bcf Mon Sep 17 00:00:00 2001
From d38931d4fe25e2f1a02fcde88b0cbf0756304631 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 18 Feb 2023 01:02:49 +0100
Subject: [PATCH] USB: quirks: Add USB_QUIRK_DELAY_INIT for Surface Go 3
@ -39,7 +39,7 @@ index 15e9bd180a1d..0d70461d01e1 100644
--
2.42.0
From 2c8a51cd05ec2625ab8268283f6eed216a4e2e1b Mon Sep 17 00:00:00 2001
From 75a8d59dc8c049e0fe3eaeb509552a37ba3dc6f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Thu, 5 Nov 2020 13:09:45 +0100
Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when
@ -272,7 +272,7 @@ index 521b2ffb4244..c8f3d05c8866 100644
--
2.42.0
From 5e71abe238543f2e8931e6b0336882574c6adddb Mon Sep 17 00:00:00 2001
From 6387e47aa58153a28176ffb65da4f3c40842b495 Mon Sep 17 00:00:00 2001
From: PJungkamp <p.jungkamp@gmail.com>
Date: Fri, 25 Feb 2022 12:04:25 +0100
Subject: [PATCH] hid/multitouch: Add support for surface pro type cover tablet

View file

@ -1,4 +1,4 @@
From 7a9ec453afe5ecc05de3f3daec2f3755fd02c2f3 Mon Sep 17 00:00:00 2001
From 42a0ecfd028c26a4ea5a5f8108c36fe3ffe4f6a2 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 19 Feb 2023 22:12:24 +0100
Subject: [PATCH] PCI: Add quirk to prevent calling shutdown mehtod

View file

@ -1,4 +1,4 @@
From a6d5bb2a087deac6ffd82f176b5a037f2f87994f Mon Sep 17 00:00:00 2001
From 0e7f1e2a3a8d9bfbacaa6dfd2f902de83390b4c1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 12 Mar 2023 01:41:57 +0100
Subject: [PATCH] platform/surface: gpe: Add support for Surface Pro 9

View file

@ -1,4 +1,4 @@
From 507234aac475d6639b99ab195f38d8be10c476c4 Mon Sep 17 00:00:00 2001
From 91a302af94f03251baa2e66abe81b0beb967a4ae Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 10 Oct 2021 20:56:57 +0200
Subject: [PATCH] ACPI: delay enumeration of devices with a _DEP pointing to an
@ -74,7 +74,7 @@ index 87e385542576..1183d09c13a6 100644
--
2.42.0
From aa099b5087160e2159c178d167025537a23e1908 Mon Sep 17 00:00:00 2001
From 2b033206c433221e3955fab9f7cc0ce07794a2ec Mon Sep 17 00:00:00 2001
From: zouxiaoh <xiaohong.zou@intel.com>
Date: Fri, 25 Jun 2021 08:52:59 +0800
Subject: [PATCH] iommu: intel-ipu: use IOMMU passthrough mode for Intel IPUs
@ -191,7 +191,7 @@ index fc4799415c3c..e10b4f62594d 100644
--
2.42.0
From ffa573f5cb76fa904d6f8cd66ad7dab31eccd1a3 Mon Sep 17 00:00:00 2001
From eec09b357ed7b25912c9bf682e21fa0f1344e912 Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Sun, 10 Oct 2021 20:57:02 +0200
Subject: [PATCH] platform/x86: int3472: Enable I2c daisy chain
@ -228,7 +228,7 @@ index 1e107fd49f82..e3e1696e7f0e 100644
--
2.42.0
From 213416982cbd90a719907c0066ea54b54a56577b Mon Sep 17 00:00:00 2001
From 3ee1b7ce0457aba33817a415213caf951dab2cbf Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Wed, 4 May 2022 23:21:45 +0100
Subject: [PATCH] media: ipu3-cio2: Move functionality from .complete() to
@ -337,7 +337,7 @@ index ca51776a961f..c027b2bfd851 100644
--
2.42.0
From 770a549c8fbf595e60adc5129aabf1f9a27627cc Mon Sep 17 00:00:00 2001
From 43767f29d49a977f39fe9bcbd9d347b5b2549f3d Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 2 Jun 2022 22:15:56 +0100
Subject: [PATCH] media: ipu3-cio2: Re-add .complete() to ipu3-cio2
@ -380,7 +380,7 @@ index c027b2bfd851..031acee26553 100644
--
2.42.0
From 9e08cb6916dcf0afd1cf7e761c79b1637badc968 Mon Sep 17 00:00:00 2001
From 5aa4977340e179ed4e2b7e1236ee8f0ed5af3d4b Mon Sep 17 00:00:00 2001
From: Daniel Scally <djrscally@gmail.com>
Date: Thu, 28 Oct 2021 21:55:16 +0100
Subject: [PATCH] media: i2c: Add driver for DW9719 VCM
@ -884,7 +884,7 @@ index 000000000000..180b04d2a6b3
--
2.42.0
From 3978aa1e89da9e6cfda3fb0591b5d9aeb0aebf84 Mon Sep 17 00:00:00 2001
From c5d772b1854f0ac07aa20ba39e7e0d513c14cd2a Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 15 Jul 2022 23:48:00 +0200
Subject: [PATCH] drivers/media/i2c: Fix DW9719 dependencies
@ -913,7 +913,7 @@ index 6959ee1a89fb..1d5082fe9ce3 100644
--
2.42.0
From 8a6c9505ca9d7a7637d5c60f35f6b38c7f41fa66 Mon Sep 17 00:00:00 2001
From a91910f04221481012703436c3e821a54332beee Mon Sep 17 00:00:00 2001
From: Daniel Scally <dan.scally@ideasonboard.com>
Date: Thu, 2 Mar 2023 12:59:39 +0000
Subject: [PATCH] platform/x86: int3472: Remap reset GPIO for INT347E
@ -969,7 +969,7 @@ index e33c2d75975c..c0c90ae66b70 100644
--
2.42.0
From 697a87edc7b6cac129d311e5c9539f1eb6d3a0b1 Mon Sep 17 00:00:00 2001
From e33de4cf8fa02ac63ceb16f3f860ddfae8ea8726 Mon Sep 17 00:00:00 2001
From: Daniel Scally <dan.scally@ideasonboard.com>
Date: Tue, 21 Mar 2023 13:45:26 +0000
Subject: [PATCH] media: i2c: Clarify that gain is Analogue gain in OV7251
@ -1008,7 +1008,7 @@ index 675fb37a6fea..43b30db08c9e 100644
--
2.42.0
From 7596584c77520e6e3958345fa2f404f2fe5ba423 Mon Sep 17 00:00:00 2001
From 4c3f0ec8d169cd6114990df67b3bb43dc351f951 Mon Sep 17 00:00:00 2001
From: Daniel Scally <dan.scally@ideasonboard.com>
Date: Wed, 22 Mar 2023 11:01:42 +0000
Subject: [PATCH] media: v4l2-core: Acquire privacy led in
@ -1059,7 +1059,7 @@ index 4fa9225aa3d9..ed4c75253cbc 100644
--
2.42.0
From 7616189535ee7f83ef622b4f2516de8f83fd0a89 Mon Sep 17 00:00:00 2001
From 6d72225fd0eefb1e15f645d404dfa31873ce5a8b Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 21 Mar 2023 23:37:16 +0800
Subject: [PATCH] platform: x86: int3472: Add MFD cell for tps68470 LED
@ -1100,7 +1100,7 @@ index e3e1696e7f0e..423dc555093f 100644
--
2.42.0
From 7de3af05f1128542fb27a72b8fe3ae219609d358 Mon Sep 17 00:00:00 2001
From 591153826d40ce4d57f2d5c4fb133e36ac187c8e Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 21 Mar 2023 23:37:17 +0800
Subject: [PATCH] include: mfd: tps68470: Add masks for LEDA and LEDB
@ -1141,7 +1141,7 @@ index 7807fa329db0..2d2abb25b944 100644
--
2.42.0
From 8f2e512696d2ead1eef0f6b4f6b00a02f3ce18b2 Mon Sep 17 00:00:00 2001
From 8c8c933fccb6d380bc2dc81625ca4419c826656d Mon Sep 17 00:00:00 2001
From: Kate Hsuan <hpa@redhat.com>
Date: Tue, 21 Mar 2023 23:37:18 +0800
Subject: [PATCH] leds: tps68470: Add LED control for tps68470

View file

@ -1,4 +1,4 @@
From a909512fc2501e9eca6b400a46283fa98e28548a Mon Sep 17 00:00:00 2001
From f30fc6335df8d95752ecfe086b8a0b1c43039073 Mon Sep 17 00:00:00 2001
From: Sachi King <nakato@nakato.io>
Date: Sat, 29 May 2021 17:47:38 +1000
Subject: [PATCH] ACPI: Add quirk for Surface Laptop 4 AMD missing irq 7
@ -65,7 +65,7 @@ index 53369c57751e..1ec1a9015178 100644
--
2.42.0
From f1b1d63f60ef83b9c8d8db177324f3496cd14542 Mon Sep 17 00:00:00 2001
From 550bd4c801d8651b3ee57a7e412b10f0e3dc8ebb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 3 Jun 2021 14:04:26 +0200
Subject: [PATCH] ACPI: Add AMD 13" Surface Laptop 4 model to irq 7 override

View file

@ -1,4 +1,4 @@
From a7c5852afe2108a4484aece5f408edf9b5f03399 Mon Sep 17 00:00:00 2001
From ecca82459be635f742336b861f26018c16aeb18f Mon Sep 17 00:00:00 2001
From: "Bart Groeneveld | GPX Solutions B.V" <bart@gpxbv.nl>
Date: Mon, 5 Dec 2022 16:08:46 +0100
Subject: [PATCH] acpi: allow usage of acpi_tad on HW-reduced platforms