Update v5.19 patches

Changes:
 - Rebase onto v5.19.10

Links:
 - kernel: ab70f2e8b1
This commit is contained in:
Maximilian Luz 2022-09-22 03:47:02 +02:00
parent 9d4b14e403
commit 03efbbd99a
No known key found for this signature in database
GPG key ID: 70EC0937F6C26F02
11 changed files with 81 additions and 113 deletions

View file

@ -1,4 +1,4 @@
From 15edbfd10d016c0003cccf20365043ab8dd7ed77 Mon Sep 17 00:00:00 2001
From 086e9ea6e92f1fdc5b02187cd3c43a47bdc10de3 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 09e192fcba3cb0f58014cbc37bbd24fdf0a0f6c7 Mon Sep 17 00:00:00 2001
From 9a69ea3a3767f1ec699a0b89bc1694b8883e5dc4 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Tue, 29 Sep 2020 17:32:22 +0900
Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3
@ -183,7 +183,7 @@ index 8ec4176d698f..25370c5a4f59 100644
--
2.37.3
From 7d7aa81c79552938fcab366108fd6cea0d4e1391 Mon Sep 17 00:00:00 2001
From 391d6b0683b6d7602db161b878e21a7d030318d2 Mon Sep 17 00:00:00 2001
From: Tsuchiya Yuto <kitakar@gmail.com>
Date: Wed, 30 Sep 2020 18:08:24 +0900
Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI
@ -245,7 +245,7 @@ index 563dd0d5ac79..32e2f000e57b 100644
--
2.37.3
From eac54025ccde2f859610996f4eff5c140551cc02 Mon Sep 17 00:00:00 2001
From e3058bb2c978cba155a7b77248c2c70b4e5d47d3 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+
@ -400,7 +400,7 @@ index 25370c5a4f59..a1de111ad1db 100644
--
2.37.3
From 009a7560924e5e43ac5a196af1757cf38ae6644f Mon Sep 17 00:00:00 2001
From 25af20fa9b857aca8818c66fec248ef881d8b953 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
@ -567,7 +567,7 @@ index a1de111ad1db..0e429779bb04 100644
--
2.37.3
From 65831ef257597e8460c5597705a4f9fab4e40ff1 Mon Sep 17 00:00:00 2001
From b3c8573c35e015c7a77829b448df3007eef79411 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
@ -645,7 +645,7 @@ index aaba2d737178..5d29e592cd34 100644
--
2.37.3
From c120646a78579db5f700103fc45631153885d055 Mon Sep 17 00:00:00 2001
From 3b1393c403f6139dcc867be737f0828dcbe198dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Tue, 10 Nov 2020 12:49:56 +0100
Subject: [PATCH] mwifiex: Use non-posted PCI register writes

View file

@ -1,4 +1,4 @@
From 8d94818d00f7a3703981bf10a7b915e906d71c05 Mon Sep 17 00:00:00 2001
From 3b181a8258dbc6ce55e7ba8f7f55006c266f7624 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 6b96d12b88e324b0f3a69b3c10a1b9e148269729 Mon Sep 17 00:00:00 2001
From f3d263ff5c3b0a75181d6d9c629db23ccffb40b5 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 5435604327a7..1165ee4f5928 100644
--
2.37.3
From 90a5b4768859cfa8beeedb10a3000eb17425171c Mon Sep 17 00:00:00 2001
From 101d8658aaafd87b8b39b50190e473b7746afd67 Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Thu, 6 Aug 2020 11:20:41 +0200
Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus
@ -1501,7 +1501,7 @@ index 000000000000..53fb86a88f97
--
2.37.3
From 44d9467e52b85dfec0b7f18bae811813852b93ff Mon Sep 17 00:00:00 2001
From 374348663a0cb1ff9aa142ba7af4dfca9654218d 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
@ -1523,7 +1523,7 @@ Patchset: ipts
1 file changed, 24 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 5c0dce78586a..825b524e81f3 100644
index c0464959cbcd..fa4f675ffeda 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,8 @@
@ -1535,7 +1535,7 @@ index 5c0dce78586a..825b524e81f3 100644
#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
#define IOAPIC_RANGE_START (0xfee00000)
@@ -307,12 +309,14 @@ int intel_iommu_enabled = 0;
@@ -295,12 +297,14 @@ int intel_iommu_enabled = 0;
EXPORT_SYMBOL_GPL(intel_iommu_enabled);
static int dmar_map_gfx = 1;
@ -1550,7 +1550,7 @@ index 5c0dce78586a..825b524e81f3 100644
int intel_iommu_gfx_mapped;
EXPORT_SYMBOL_GPL(intel_iommu_gfx_mapped);
@@ -2659,6 +2663,9 @@ static int device_def_domain_type(struct device *dev)
@@ -2683,6 +2687,9 @@ static int device_def_domain_type(struct device *dev)
if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
return IOMMU_DOMAIN_IDENTITY;
@ -1560,7 +1560,7 @@ index 5c0dce78586a..825b524e81f3 100644
}
return 0;
@@ -3095,6 +3102,9 @@ static int __init init_dmars(void)
@@ -3105,6 +3112,9 @@ static int __init init_dmars(void)
if (!dmar_map_gfx)
iommu_identity_mapping |= IDENTMAP_GFX;
@ -1570,7 +1570,7 @@ index 5c0dce78586a..825b524e81f3 100644
check_tylersburg_isoch();
ret = si_domain_init(hw_pass_through);
@@ -4923,6 +4933,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
@@ -4910,6 +4920,17 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
dmar_map_gfx = 0;
}
@ -1588,7 +1588,7 @@ index 5c0dce78586a..825b524e81f3 100644
/* G4x/GM45 integrated gfx dmar support is totally busted. */
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
@@ -4958,6 +4979,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
@@ -4945,6 +4966,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);

View file

@ -1,4 +1,4 @@
From 343924460b3a9020c8e118da7047eaae33043983 Mon Sep 17 00:00:00 2001
From 3c81c666d9953a794458a776e8fc3a7f01bc5e3f Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:36 +0200
Subject: [PATCH] platform/surface: aggregator: Allow is_ssam_device() to be
@ -55,7 +55,7 @@ index cc257097eb05..62b38b4487eb 100644
--
2.37.3
From 81b69bf07ee898a7ad0f458e8310f322ac8606e1 Mon Sep 17 00:00:00 2001
From 27a764414ea8159400e18f4f2d6cc343a0ef0fe1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:37 +0200
Subject: [PATCH] platform/surface: aggregator: Allow devices to be marked as
@ -164,7 +164,7 @@ index 62b38b4487eb..6df7c8d4e50e 100644
--
2.37.3
From 8541ae8819b1d7461fc970542261345446e82b7e Mon Sep 17 00:00:00 2001
From c43c8482fd9b50c583abb5ac580b5f0c0bdc70b0 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:38 +0200
Subject: [PATCH] platform/surface: aggregator: Allow notifiers to avoid
@ -460,7 +460,7 @@ index 6df7c8d4e50e..c418f7f2732d 100644
--
2.37.3
From 5327cf4cbc40cf7a654ed1d826634a565709c73f Mon Sep 17 00:00:00 2001
From 14bc87cdfd2e26b659555dc062e015feed05c135 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:39 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Use client device
@ -479,7 +479,7 @@ Patchset: surface-sam
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index ce2bd88feeaa..9f630e890ff7 100644
index 08019c6ccc9c..71fe014d3ebb 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -468,7 +468,7 @@ static int ssam_base_hub_probe(struct ssam_device *sdev)
@ -512,7 +512,7 @@ index ce2bd88feeaa..9f630e890ff7 100644
--
2.37.3
From 7e1e2cbb7b039e420c6c55052404417c5bcb14df Mon Sep 17 00:00:00 2001
From 9815b041ed7f4ab5ea63dad939b01a3f831bcd79 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:40 +0200
Subject: [PATCH] power/supply: surface_charger: Use client device wrappers for
@ -556,7 +556,7 @@ index a060c36c7766..59182d55742d 100644
--
2.37.3
From 6f4e94f193ff0af818c95b26f6ff9fa2ba801480 Mon Sep 17 00:00:00 2001
From 2b1a6ac8c71b964bbc27d51128765f6085e4d952 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:41 +0200
Subject: [PATCH] power/supply: surface_battery: Use client device wrappers for
@ -600,7 +600,7 @@ index 5ec2e6bb2465..540707882bb0 100644
--
2.37.3
From 895fb2dab19c9ab2fe25968f88afe9e250d25e40 Mon Sep 17 00:00:00 2001
From 1d76184c74ca14d5848d247cd723cb3ae6c76459 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:42 +0200
Subject: [PATCH] HID: surface-hid: Add support for hot-removal
@ -714,7 +714,7 @@ index e46330b2e561..87637f813de2 100644
--
2.37.3
From 2a2d9f4bd42194af647055b3e176ecb9ec7aeeec Mon Sep 17 00:00:00 2001
From badf44e9c231da4129c62c0437ffc3778742dc61 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:43 +0200
Subject: [PATCH] platform/surface: aggregator: Add comment for KIP subsystem
@ -755,7 +755,7 @@ index c3de43edcffa..26b95ec12733 100644
--
2.37.3
From a5c7fa614688bf6a42b2391d87f9709a30c62d45 Mon Sep 17 00:00:00 2001
From 7081e62b97913bf3d9958b4bb396da477a418318 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:44 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Generify subsystem hub
@ -791,7 +791,7 @@ Patchset: surface-sam
1 file changed, 153 insertions(+), 116 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 9f630e890ff7..09cbeee2428b 100644
index 71fe014d3ebb..0b1ca1155770 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -308,30 +308,159 @@ static int ssam_hub_register_clients(struct device *parent, struct ssam_controll
@ -1145,7 +1145,7 @@ index 9f630e890ff7..09cbeee2428b 100644
--
2.37.3
From 914afdc9a4ddd402904039546ac2f1161a5535a2 Mon Sep 17 00:00:00 2001
From 67b8de85e1deb327617206db943f92f95abfe477 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:45 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Change device ID for
@ -1165,7 +1165,7 @@ Patchset: surface-sam
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 09cbeee2428b..b11ce87c7184 100644
index 0b1ca1155770..d0e9e287c7e5 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -43,7 +43,7 @@ static const struct software_node ssam_node_root = {
@ -1189,7 +1189,7 @@ index 09cbeee2428b..b11ce87c7184 100644
--
2.37.3
From 07bb747d9ad79840bef5b2f922cc0691ffa3db7e Mon Sep 17 00:00:00 2001
From 57d73c1974395c66f69b962fc8202e0de8a7d84d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:46 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add KIP device hub
@ -1221,7 +1221,7 @@ Patchset: surface-sam
1 file changed, 101 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index b11ce87c7184..f15cef60630f 100644
index d0e9e287c7e5..0b4aeba4ad93 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -551,6 +551,93 @@ static struct ssam_device_driver ssam_base_hub_driver = {
@ -1318,7 +1318,7 @@ index b11ce87c7184..f15cef60630f 100644
/* -- SSAM platform/meta-hub driver. ---------------------------------------- */
static const struct acpi_device_id ssam_platform_hub_match[] = {
@@ -673,18 +760,30 @@ static int __init ssam_device_hub_init(void)
@@ -676,18 +763,30 @@ static int __init ssam_device_hub_init(void)
status = platform_driver_register(&ssam_platform_hub_driver);
if (status)
@ -1354,7 +1354,7 @@ index b11ce87c7184..f15cef60630f 100644
--
2.37.3
From 33f616b388ac8845bdd3aadb8c1a5e41e5eb86d8 Mon Sep 17 00:00:00 2001
From ce1956200975e2970fdff53a087e7a767642c1a1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 27 May 2022 04:34:47 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
@ -1388,7 +1388,7 @@ Patchset: surface-sam
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index f15cef60630f..bf3303f1aa71 100644
index 0b4aeba4ad93..3b1310d61a24 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -41,6 +41,12 @@ static const struct software_node ssam_node_root = {
@ -1455,7 +1455,7 @@ index f15cef60630f..bf3303f1aa71 100644
--
2.37.3
From e52704dc9d78c8c7bc2cb192063f0498a10e8655 Mon Sep 17 00:00:00 2001
From 3999328cf31503288268f970c858549ff5b7cf49 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Fri, 10 Jun 2022 14:41:58 +0900
Subject: [PATCH] platform/surface: avoid flush_scheduled_work() usage
@ -1534,7 +1534,7 @@ index 7b758f8cc137..c0e12f0b9b79 100644
--
2.37.3
From 23b3d5bdf836ab4e155c9c95d860e35822aabd7e Mon Sep 17 00:00:00 2001
From d5e0484b36959f14cb2776539abe080fd3da3f2a Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 14 Jun 2022 21:41:17 +0200
Subject: [PATCH] platform/surface: aggregator: Reserve more event- and
@ -1756,7 +1756,7 @@ index 26b95ec12733..45501b6e54e8 100644
--
2.37.3
From c7d12cb78b2beb6cac2ccea84707dbcc4111b3d6 Mon Sep 17 00:00:00 2001
From 2400a6e2d77a9e22bf6c86bd0249f88ff9247913 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 20:36:39 +0200
Subject: [PATCH] platform/surface: aggregator: Add helper macros for requests
@ -1969,7 +1969,7 @@ index c418f7f2732d..6cf7e80312d5 100644
--
2.37.3
From c133afbb407d272327b236ec809e025407335165 Mon Sep 17 00:00:00 2001
From 9dde47356cb22272f3c05555fd491b893cffcf16 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 20:36:40 +0200
Subject: [PATCH] platform/surface: Add KIP/POS tablet-mode switch driver
@ -2701,7 +2701,7 @@ index 000000000000..596ca6c80681
--
2.37.3
From 4c7ffca61c7b8d0e61817a7b3b33a1de211e7fe0 Mon Sep 17 00:00:00 2001
From a066a9ca172fa11d04ebb9827921a8a6bd803a2b Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 20:36:41 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@ -2722,7 +2722,7 @@ Patchset: surface-sam
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index bf3303f1aa71..8f249df673a4 100644
index 3b1310d61a24..6994168ee898 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -77,6 +77,12 @@ static const struct software_node ssam_node_tmp_pprof = {
@ -2754,7 +2754,7 @@ index bf3303f1aa71..8f249df673a4 100644
--
2.37.3
From 6ba6d1fcf6051cb53a77699f48c16eae657af1da Mon Sep 17 00:00:00 2001
From f49217f6c686d364cafd42a9db8f60eeb609269d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 20:36:42 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add support for tablet
@ -2774,7 +2774,7 @@ Patchset: surface-sam
1 file changed, 7 insertions(+)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 8f249df673a4..f1c5905f1c16 100644
index 6994168ee898..6e14dd18c7a7 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -191,6 +191,12 @@ static const struct software_node ssam_node_hid_kip_iid5 = {
@ -2801,7 +2801,7 @@ index 8f249df673a4..f1c5905f1c16 100644
--
2.37.3
From cc428a2c4526883ee235656522c24e5db1a1ed0c Mon Sep 17 00:00:00 2001
From ddb145f8b3d338afaaa6bc13dd009fc334ee41ee Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 22:57:58 +0200
Subject: [PATCH] platform/surface: aggregator: Move device registry helper
@ -3013,7 +3013,7 @@ index abbbb5b08b07..e0b0381a2834 100644
- return bus_unregister(&ssam_bus_type);
-}
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index f1c5905f1c16..c680792a037e 100644
index 6e14dd18c7a7..eb88021c208c 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -286,76 +286,6 @@ static const struct software_node *ssam_node_group_sp8[] = {
@ -3110,7 +3110,7 @@ index f1c5905f1c16..c680792a037e 100644
else
ssam_remove_clients(&hub->sdev->dev);
@@ -769,7 +698,7 @@ static int ssam_platform_hub_probe(struct platform_device *pdev)
@@ -772,7 +701,7 @@ static int ssam_platform_hub_probe(struct platform_device *pdev)
set_secondary_fwnode(&pdev->dev, root);
@ -3197,7 +3197,7 @@ index 6cf7e80312d5..46c45d1b6368 100644
--
2.37.3
From 27f8c2755977e980995a6c1a1fc4f310e7fd845d Mon Sep 17 00:00:00 2001
From 2c8b24578fe15ed64beff660f75821b4b2931fbb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 22:57:59 +0200
Subject: [PATCH] platform/surface: aggregator: Move subsystem hub drivers to
@ -3684,7 +3684,7 @@ index 000000000000..43061514be38
+MODULE_DESCRIPTION("Subsystem device hub driver for Surface System Aggregator Module");
+MODULE_LICENSE("GPL");
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index c680792a037e..0cbb7f3a6b2d 100644
index eb88021c208c..76dc9c4f108e 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -11,14 +11,11 @@
@ -4038,7 +4038,7 @@ index c680792a037e..0cbb7f3a6b2d 100644
/* -- SSAM platform/meta-hub driver. ---------------------------------------- */
static const struct acpi_device_id ssam_platform_hub_match[] = {
@@ -727,44 +395,7 @@ static struct platform_driver ssam_platform_hub_driver = {
@@ -730,44 +398,7 @@ static struct platform_driver ssam_platform_hub_driver = {
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
},
};
@ -4087,7 +4087,7 @@ index c680792a037e..0cbb7f3a6b2d 100644
--
2.37.3
From 98864856924810e997eca629da2544485183a9ae Mon Sep 17 00:00:00 2001
From 40051497382a40aef690562429e8827392e42b5f Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 24 Jun 2022 22:58:00 +0200
Subject: [PATCH] platform/surface: Update copyright year of various drivers
@ -4342,7 +4342,7 @@ index 30fb50fde450..492c82e69182 100644
#include <linux/fs.h>
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index 0cbb7f3a6b2d..d5655f6a4a41 100644
index 76dc9c4f108e..93ab62eb393d 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -6,7 +6,7 @@
@ -4409,7 +4409,7 @@ index 6373d3b5eb7f..fbf2e11fd6ce 100644
--
2.37.3
From af14813f2c2c1571196481fa564649e0e92dc503 Mon Sep 17 00:00:00 2001
From ec73ceb2ee84043dc0e44311c9046f07a885dddc Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Date: Wed, 13 Jul 2022 06:09:16 +0200
Subject: [PATCH] MAINTAINERS: repair file entry in MICROSOFT SURFACE
@ -4455,7 +4455,7 @@ index 55e80354a097..6772c9d0eccc 100644
--
2.37.3
From 799b65f7dd3e013e1b5cd57877cc08c0b8298504 Mon Sep 17 00:00:00 2001
From 19d39f5eb3be113da3661a81a7a13ec0fc0a9f37 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 17 Jul 2022 14:07:35 +0200
Subject: [PATCH] platform/surface: tabletsw: Fix __le32 integer access
@ -4499,39 +4499,7 @@ index 596ca6c80681..27d95a6a7851 100644
--
2.37.3
From 679ec34c030abbb3dffb75bda613cbe052a073e1 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 8 Jul 2022 03:34:44 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add support for
Surface Laptop Go 2
The Surface Laptop Go 2 seems to have the same SAM client devices as the
Surface Laptop Go 1, so re-use its node group.
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Patchset: surface-sam
---
drivers/platform/surface/surface_aggregator_registry.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/platform/surface/surface_aggregator_registry.c b/drivers/platform/surface/surface_aggregator_registry.c
index d5655f6a4a41..93ab62eb393d 100644
--- a/drivers/platform/surface/surface_aggregator_registry.c
+++ b/drivers/platform/surface/surface_aggregator_registry.c
@@ -325,6 +325,9 @@ static const struct acpi_device_id ssam_platform_hub_match[] = {
/* Surface Laptop Go 1 */
{ "MSHW0118", (unsigned long)ssam_node_group_slg1 },
+ /* Surface Laptop Go 2 */
+ { "MSHW0290", (unsigned long)ssam_node_group_slg1 },
+
/* Surface Laptop Studio */
{ "MSHW0123", (unsigned long)ssam_node_group_sls },
--
2.37.3
From edc6a485b06125a928c62c7d149861ca4d603ccd Mon Sep 17 00:00:00 2001
From 98765fb785d93cafba6012dd98bd75e22bff18e9 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jun 2022 20:42:00 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
@ -4604,7 +4572,7 @@ index 93ab62eb393d..7d82398f55b1 100644
--
2.37.3
From a92cc0122356f6015bb73773038b61a5e269a0bd Mon Sep 17 00:00:00 2001
From 6db6e2fbbf973e05313ff49ced60a25b16b5f9bd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jun 2022 20:52:47 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Rename HID device
@ -4697,7 +4665,7 @@ index 7d82398f55b1..9970f89b1411 100644
--
2.37.3
From 2b28caa61d0783215ce24c418e435214f867c0dd Mon Sep 17 00:00:00 2001
From 5df824cc1d6179b0f92675528d4af9e35af1a46c Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sat, 25 Jun 2022 20:54:59 +0200
Subject: [PATCH] platform/surface: aggregator_registry: Add HID devices for

View file

@ -1,4 +1,4 @@
From 749702e2ed1883c23763cc434f2ce1ddcdd0f336 Mon Sep 17 00:00:00 2001
From 09377616cda2a365fff6b4f4cdce3b54cfd5d418 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 08b561f0709d..d7c397bce0f0 100644
--
2.37.3
From bcb73e7e4c52a3c430e252d090614d18bad7e044 Mon Sep 17 00:00:00 2001
From bb7f8a7f6281bd79bc47f8715a33243a1cbe8b53 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 48e1c1ac0c69aa95a8c9f19307fffb4b77cf2170 Mon Sep 17 00:00:00 2001
From 9db35ae0c7a69695196965dba37bda99aafea13e 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 480476121c01..36e1bf7b7a01 100644
--
2.37.3
From df10e0afc475ed5177cfa692db6dbfea28d7a9fe Mon Sep 17 00:00:00 2001
From 99602a6b72967c5599c5a054f2147c67387275e9 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 62a4fddab3c7a44dc5b17633ccc7f125f59ee3f9 Mon Sep 17 00:00:00 2001
From 910e190ce4bf58fb58ccea2cdb2a31a3b7641311 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
@ -231,7 +231,7 @@ index 2e72922e36f5..15f5f11c4b85 100644
--
2.37.3
From 2b1d157b58d6a192e147dbfc84526e7ffa9ae2c1 Mon Sep 17 00:00:00 2001
From 3ec3699033ec26f7aeaaf5a256ca31e3e84e95ce 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 716290db6ffaeb61e78eb40d6b466e05bb983990 Mon Sep 17 00:00:00 2001
From fac5698e0526a384d4f6ccf963b99e05f160e115 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Thu, 21 Jul 2022 14:11:20 +0200
Subject: [PATCH] platform/surface: gpe: Add support for 13" Intel version of

View file

@ -1,4 +1,4 @@
From 63aeabc28778964d2ff7f33c81394d82945beae4 Mon Sep 17 00:00:00 2001
From b15e789fd5b50d0c8e64647e833c5b74f9ad6520 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 762b61f67e6c..2c0f39a7f2a1 100644
--
2.37.3
From 0a1366c998d0bbd976995ddedb3c1fca8665db6c Mon Sep 17 00:00:00 2001
From 608949a8da76d664b0ee84e8e053c3129eb5231d 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
@ -100,7 +100,7 @@ Patchset: cameras
1 file changed, 30 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 825b524e81f3..095d566c058f 100644
index fa4f675ffeda..9bf47eb74c9f 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -37,6 +37,12 @@
@ -116,7 +116,7 @@ index 825b524e81f3..095d566c058f 100644
#define IS_IPTS(pdev) ((pdev)->vendor == PCI_VENDOR_ID_INTEL && \
((pdev)->device == 0x9d3e))
#define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
@@ -310,12 +316,14 @@ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
@@ -298,12 +304,14 @@ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
static int dmar_map_gfx = 1;
static int dmar_map_ipts = 1;
@ -131,7 +131,7 @@ index 825b524e81f3..095d566c058f 100644
#define IDENTMAP_IPTS 16
int intel_iommu_gfx_mapped;
@@ -2664,6 +2672,9 @@ static int device_def_domain_type(struct device *dev)
@@ -2688,6 +2696,9 @@ static int device_def_domain_type(struct device *dev)
if ((iommu_identity_mapping & IDENTMAP_GFX) && IS_GFX_DEVICE(pdev))
return IOMMU_DOMAIN_IDENTITY;
@ -141,7 +141,7 @@ index 825b524e81f3..095d566c058f 100644
if ((iommu_identity_mapping & IDENTMAP_IPTS) && IS_IPTS(pdev))
return IOMMU_DOMAIN_IDENTITY;
}
@@ -3102,6 +3113,9 @@ static int __init init_dmars(void)
@@ -3112,6 +3123,9 @@ static int __init init_dmars(void)
if (!dmar_map_gfx)
iommu_identity_mapping |= IDENTMAP_GFX;
@ -151,7 +151,7 @@ index 825b524e81f3..095d566c058f 100644
if (!dmar_map_ipts)
iommu_identity_mapping |= IDENTMAP_IPTS;
@@ -4933,6 +4947,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
@@ -4920,6 +4934,18 @@ static void quirk_iommu_igfx(struct pci_dev *dev)
dmar_map_gfx = 0;
}
@ -170,7 +170,7 @@ index 825b524e81f3..095d566c058f 100644
static void quirk_iommu_ipts(struct pci_dev *dev)
{
if (!IS_IPTS(dev))
@@ -4944,6 +4970,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
@@ -4931,6 +4957,7 @@ static void quirk_iommu_ipts(struct pci_dev *dev)
pci_info(dev, "Passthrough IOMMU for IPTS\n");
dmar_map_ipts = 0;
}
@ -178,7 +178,7 @@ index 825b524e81f3..095d566c058f 100644
/* G4x/GM45 integrated gfx dmar support is totally busted. */
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2a40, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x2e00, quirk_iommu_igfx);
@@ -4979,6 +5006,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
@@ -4966,6 +4993,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163A, quirk_iommu_igfx);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x163D, quirk_iommu_igfx);
@ -191,7 +191,7 @@ index 825b524e81f3..095d566c058f 100644
--
2.37.3
From 23350bbaa1baea7694766c9aeeeecacd67d5a877 Mon Sep 17 00:00:00 2001
From ee8081e45bd1644c436ea55be8606e6959f6a416 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 22f61b47f9e5..e1de1ff40bba 100644
--
2.37.3
From 247beedc634caa1a965f462451641d7f37f07d74 Mon Sep 17 00:00:00 2001
From cb1a1e6fe44f6ae53ff43a6c0aedcd2a44b04f4e 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
@ -734,7 +734,7 @@ index 000000000000..8451c75b696b
--
2.37.3
From 131a1b6b516582eeeba78853894a168c0a4604fd Mon Sep 17 00:00:00 2001
From 1ab2b91a4920c108eebcd68c3962b4a91e538294 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
@ -849,7 +849,7 @@ index dbdbdb648a0d..d0715144bf3e 100644
--
2.37.3
From 82abd409bf7173da2ed6b76d95410f1f60e714fa Mon Sep 17 00:00:00 2001
From 8255d1840bd305be053d7c3b004bfe050ee6124f 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
@ -892,7 +892,7 @@ index d0715144bf3e..3a25dfc696b2 100644
--
2.37.3
From 1abd24d4d11a1842c20c2d7feed35b39c4061745 Mon Sep 17 00:00:00 2001
From 3f8353cc39389ebc36146883e458b791e69a1c54 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
@ -921,7 +921,7 @@ index 5c245f642ae3..50ea62e63784 100644
--
2.37.3
From 86f47552d0d743f3100b07c6f859033c031db588 Mon Sep 17 00:00:00 2001
From a2b8d46b1eda63338cdefe6fa7ac2ef4f75da10f Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@linux.intel.com>
Date: Thu, 25 Aug 2022 21:36:37 +0300
Subject: [PATCH] ipu3-imgu: Fix NULL pointer dereference in active selection
@ -1002,7 +1002,7 @@ index d1c539cefba8..2234bb8d48b3 100644
--
2.37.3
From 90d952acdd44a833c8131cd63df69a43453763fe Mon Sep 17 00:00:00 2001
From 7c4ee6d2e714c2e9d03e84d53cd8248086ecef17 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 7 Sep 2022 15:38:08 +0200
Subject: [PATCH] ipu3-imgu: Fix NULL pointer dereference in

View file

@ -1,4 +1,4 @@
From f48f910254bcbc02338128293f8199e832b07fcb Mon Sep 17 00:00:00 2001
From 6fc51d83b777a7f9ba598377a83608093f358765 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 907cc98b1938..0116d27b29ea 100644
--
2.37.3
From 324a9a147dda942ca3f96b1d10edab524ea47193 Mon Sep 17 00:00:00 2001
From 950171fcfd30c3e3aab673141f2b66f3093616dc 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