From ad369a7e6dbca0a091dcc41485ea59426f93fb37 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Wed, 19 May 2021 08:27:58 +0200 Subject: [PATCH] Update v5.12 patches Changes: Rebased on top of 5.12.4 Signed-off-by: Dorian Stoll --- patches/5.12/0001-surface3-oemb.patch | 2 +- patches/5.12/0002-mwifiex.patch | 50 ++++----- patches/5.12/0003-ath10k.patch | 2 +- patches/5.12/0004-ipts.patch | 4 +- patches/5.12/0005-surface-sam-over-hid.patch | 4 +- patches/5.12/0006-surface-sam.patch | 103 ++++++------------ patches/5.12/0007-surface-hotplug.patch | 68 ------------ ...ver.patch => 0007-surface-typecover.patch} | 2 +- ...{0009-cameras.patch => 0008-cameras.patch} | 24 ++-- 9 files changed, 78 insertions(+), 181 deletions(-) delete mode 100644 patches/5.12/0007-surface-hotplug.patch rename patches/5.12/{0008-surface-typecover.patch => 0007-surface-typecover.patch} (99%) rename patches/5.12/{0009-cameras.patch => 0008-cameras.patch} (99%) diff --git a/patches/5.12/0001-surface3-oemb.patch b/patches/5.12/0001-surface3-oemb.patch index cd0cd5db5..f5665a466 100644 --- a/patches/5.12/0001-surface3-oemb.patch +++ b/patches/5.12/0001-surface3-oemb.patch @@ -1,4 +1,4 @@ -From d0eacfedf5f6d7c8fd922dff1cb65af9cff55bde Mon Sep 17 00:00:00 2001 +From cc92b681616a329c3a0898f68c18595d0c97bf83 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 18 Oct 2020 16:42:44 +0900 Subject: [PATCH] (surface3-oemb) add DMI matches for Surface 3 with broken DMI diff --git a/patches/5.12/0002-mwifiex.patch b/patches/5.12/0002-mwifiex.patch index 849ee94d4..6b863e15b 100644 --- a/patches/5.12/0002-mwifiex.patch +++ b/patches/5.12/0002-mwifiex.patch @@ -1,4 +1,4 @@ -From 3596a76849d8e7c32b55afdaefc7a14dec73535a Mon Sep 17 00:00:00 2001 +From e41d64051fa974194578aa3c282019883903710b Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Mon, 28 Sep 2020 17:46:49 +0900 Subject: [PATCH] mwifiex: pcie: add DMI-based quirk impl for Surface devices @@ -206,7 +206,7 @@ index 000000000000..5326ae7e5671 -- 2.31.1 -From ccb67c2d419363144d81c90116241ecb02c8aa00 Mon Sep 17 00:00:00 2001 +From 05d2ca97d1f7f9e0f6e6a8f54216b11207da319f Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Tue, 29 Sep 2020 17:25:22 +0900 Subject: [PATCH] mwifiex: pcie: add reset_d3cold quirk for Surface gen4+ @@ -407,7 +407,7 @@ index 5326ae7e5671..8b9dcb5070d8 100644 -- 2.31.1 -From 015c67d03094f80d7654590f52346ae0f057895f Mon Sep 17 00:00:00 2001 +From 99449a41ccfcf131aecf74167bcfd4728155e532 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Tue, 29 Sep 2020 17:32:22 +0900 Subject: [PATCH] mwifiex: pcie: add reset_wsid quirk for Surface 3 @@ -586,7 +586,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644 -- 2.31.1 -From 8678d63c360deb7b252e3d4e77501f324ef6c275 Mon Sep 17 00:00:00 2001 +From 189fdd3a11c3ff03f589bedef9b9788d4d117672 Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Wed, 30 Sep 2020 18:08:24 +0900 Subject: [PATCH] mwifiex: pcie: (OEMB) add quirk for Surface 3 with broken DMI @@ -648,7 +648,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644 -- 2.31.1 -From 560a67e4d3cafa4244a7dc6d1b05a13fbe711d10 Mon Sep 17 00:00:00 2001 +From b3eeb60bfd7889b907f0311251a53c6d7b042b4a Mon Sep 17 00:00:00 2001 From: Tsuchiya Yuto Date: Sun, 4 Oct 2020 00:11:49 +0900 Subject: [PATCH] mwifiex: pcie: disable bridge_d3 for Surface gen4+ @@ -803,7 +803,7 @@ index 3ef7440418e3..a95ebac06e13 100644 -- 2.31.1 -From bf387df3cb4f962f8ac1b1dccc32d79f57e1847f Mon Sep 17 00:00:00 2001 +From 7350fdbdcb54feb567aba9bd6308e568f3a536b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 3 Nov 2020 13:28:04 +0100 Subject: [PATCH] mwifiex: Add quirk resetting the PCI bridge on MS Surface @@ -970,7 +970,7 @@ index a95ebac06e13..4ec2ae72f632 100644 -- 2.31.1 -From f75c9270c62f4e6e63992f00d4efafe5b89f92d0 Mon Sep 17 00:00:00 2001 +From c9a2c5d1e4db40a776572033cbe7f51d416e0008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 25 Mar 2021 11:33:02 +0100 Subject: [PATCH] Bluetooth: btusb: Lower passive lescan interval on Marvell @@ -1048,7 +1048,7 @@ index 5cbfbd948f67..824512fafa23 100644 -- 2.31.1 -From b5afd603cf51c04375333eade03e8591afbbc9ec Mon Sep 17 00:00:00 2001 +From 5040dfdf71903e468c9048b2d17bda4e86456183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 12:31:26 +0100 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type @@ -1149,7 +1149,7 @@ index a2ed268ce0da..789de1b0c5b1 100644 -- 2.31.1 -From 9fb79eb7550213b49113f6a5a3769beb036e84a7 Mon Sep 17 00:00:00 2001 +From ef4bf467f59627fb7a8c8c6a420f00754c0c1bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 10 Nov 2020 12:49:56 +0100 Subject: [PATCH] mwifiex: Use non-posted PCI register writes @@ -1206,7 +1206,7 @@ index 8a99e243aff2..84b1d30e07e4 100644 -- 2.31.1 -From ab74478cdd1d5420724fc08c86334c89723b30be Mon Sep 17 00:00:00 2001 +From b882dd1b4434b879d6bd0df0df1d77d4e1b50c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 12:44:39 +0100 Subject: [PATCH] mwifiex: Use function to check whether interface type change @@ -1439,7 +1439,7 @@ index 789de1b0c5b1..13698818e58a 100644 -- 2.31.1 -From dec53d6370752fb8d6e92d16320165b0b3287004 Mon Sep 17 00:00:00 2001 +From d90a13d24191c93e3e5735c215084986cd5b5525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 13:33:04 +0100 Subject: [PATCH] mwifiex: Run SET_BSS_MODE when changing from P2P to STATION @@ -1507,7 +1507,7 @@ index 13698818e58a..f5b9f1d26114 100644 -- 2.31.1 -From e5bfda138b3eb1e9f0011f92e4d7dbd2d4816fe0 Mon Sep 17 00:00:00 2001 +From d02f72ed2bb12c7d5685a0e7732cf9d915cf3057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 14:42:54 +0100 Subject: [PATCH] mwifiex: Use helper function for counting interface types @@ -1683,7 +1683,7 @@ index f5b9f1d26114..44cff715bf29 100644 -- 2.31.1 -From 8519e68fec2ad73a8b493969029b9b7a8467c740 Mon Sep 17 00:00:00 2001 +From c3429bccaa9f0f5c0bc94fab7fe49592b0c4c6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:56:58 +0100 Subject: [PATCH] mwifiex: Update virtual interface counters right after @@ -1786,7 +1786,7 @@ index 44cff715bf29..e637129a411f 100644 -- 2.31.1 -From ab492bd676fcb8c90caff134af78d560b3490cfa Mon Sep 17 00:00:00 2001 +From d5a359f4f8f1147a8f5a9bf37a735db5dddd8a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 13:42:40 +0100 Subject: [PATCH] mwifiex: Allow switching interface type from P2P_CLIENT to @@ -1875,7 +1875,7 @@ index e637129a411f..395573db6405 100644 -- 2.31.1 -From e4791054528309e003aef43a0f0558d873a1c931 Mon Sep 17 00:00:00 2001 +From 77ae5f7bc2e57354b5309f3344581ff7b3ff5ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:31:08 +0100 Subject: [PATCH] mwifiex: Handle interface type changes from AP to STATION @@ -1902,7 +1902,7 @@ index 395573db6405..90a757aa0b25 100644 -- 2.31.1 -From ab39a7f08c0ce93a37678e312beb8c549ef93d3a Mon Sep 17 00:00:00 2001 +From ea851788f36bea7782b5bbc21d736e24ff2d998e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Fri, 26 Mar 2021 15:32:16 +0100 Subject: [PATCH] mwifiex: Properly initialize private structure on interface @@ -1957,7 +1957,7 @@ index 90a757aa0b25..0c01d8f9048e 100644 -- 2.31.1 -From 8724b59dec1bfc4e121d56fc2af7896ad5828da6 Mon Sep 17 00:00:00 2001 +From 92df90cba905bbca6a882f8458c81f80c70b0023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sat, 27 Mar 2021 12:19:14 +0100 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual @@ -1989,7 +1989,7 @@ index 0c01d8f9048e..8c472b2d982a 100644 -- 2.31.1 -From 357fcda1afc4358341fc0e08e07e7e8b5dd3b80e Mon Sep 17 00:00:00 2001 +From 533699803eda2041076cf6a300e1f3f5732009e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sun, 28 Mar 2021 21:10:06 +0200 Subject: [PATCH] mwifiex: Try waking the firmware until we get an interrupt @@ -2078,7 +2078,7 @@ index 84b1d30e07e4..88d30ec6d57d 100644 -- 2.31.1 -From e1528a86d8fa7d6ccb2e3f66072570dfdbfe74d4 Mon Sep 17 00:00:00 2001 +From d8acf846d6469ed7d8bf66a3ee94825c02cd27e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 14:30:28 +0200 Subject: [PATCH] mwifiex: Deactive host sleep using HSCFG after it was @@ -2234,7 +2234,7 @@ index d3a968ef21ef..76db9a7b8199 100644 -- 2.31.1 -From 0eeac2b292dd66fe0c5d98fcbd2b88f451182d70 Mon Sep 17 00:00:00 2001 +From 3dc682996cbe561cb7d74534237c195fc8cb193d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 14:23:05 +0200 Subject: [PATCH] mwifiex: Add quirk to disable deep sleep with certain @@ -2337,7 +2337,7 @@ index 6b5d35d9e69f..8e49ebca1847 100644 -- 2.31.1 -From b9a6b46fd8f7fb2c184be6b626736c09d8614841 Mon Sep 17 00:00:00 2001 +From c3c96da7c632c88cf7e2a778325aff68475d34af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Wed, 11 Nov 2020 15:17:07 +0100 Subject: [PATCH] mwifiex: Don't log error on suspend if wake-on-wlan is @@ -2369,7 +2369,7 @@ index 8c472b2d982a..153025d1b2fa 100644 -- 2.31.1 -From bd81bc5914db84b7b31fe58c6d3e3176c4d6cd3f Mon Sep 17 00:00:00 2001 +From fa2b6c9f6d650e4799463505b46cfc7aae6fdae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Sun, 28 Mar 2021 21:42:54 +0200 Subject: [PATCH] mwifiex: Log an error on command failure during key-material @@ -2409,7 +2409,7 @@ index 153025d1b2fa..ef6ce3f63aec 100644 -- 2.31.1 -From 75c94be522f0df35fd29c4dfc39a923dea06d108 Mon Sep 17 00:00:00 2001 +From 13ba182d09683220efaf82755d6e3e00b78e0b87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:44:03 +0200 Subject: [PATCH] mwifiex: Fix an incorrect comment @@ -2437,7 +2437,7 @@ index 6696bce56178..b0695432b26a 100644 -- 2.31.1 -From 157e47ebb98d87afadee85569c72dbb799d221b1 Mon Sep 17 00:00:00 2001 +From 3bda721df0c91676950c6495e81ad2962c1b6a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:45:59 +0200 Subject: [PATCH] mwifiex: Send DELBA requests according to spec @@ -2480,7 +2480,7 @@ index b0695432b26a..9ff2058bcd7e 100644 -- 2.31.1 -From c69a999af5099a54e3c751e748e3e1e955081bf2 Mon Sep 17 00:00:00 2001 +From 3359075cbe34012408a202dfff3b49be25e6056d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Tue, 13 Apr 2021 12:57:41 +0200 Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware diff --git a/patches/5.12/0003-ath10k.patch b/patches/5.12/0003-ath10k.patch index c51f8d00d..dbc9ce44c 100644 --- a/patches/5.12/0003-ath10k.patch +++ b/patches/5.12/0003-ath10k.patch @@ -1,4 +1,4 @@ -From 2bf136857468473347b126eff8226fac207807e5 Mon Sep 17 00:00:00 2001 +From 6597ac50d11f3c6e0720088135cec5ae1e955f8c Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 27 Feb 2021 00:45:52 +0100 Subject: [PATCH] ath10k: Add module parameters to override board files diff --git a/patches/5.12/0004-ipts.patch b/patches/5.12/0004-ipts.patch index a9cda38a2..51c7caaec 100644 --- a/patches/5.12/0004-ipts.patch +++ b/patches/5.12/0004-ipts.patch @@ -1,4 +1,4 @@ -From 582a1ab0b359cbe8daa444aa19075a627e0c953b Mon Sep 17 00:00:00 2001 +From 62a84bf5ae4f90b5ee6425a1b1af9b9008c5a213 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 30 Jul 2020 13:21:53 +0200 Subject: [PATCH] misc: mei: Add missing IPTS device IDs @@ -36,7 +36,7 @@ index c3393b383e59..0098f98426c1 100644 -- 2.31.1 -From 53fd6bc65d8ca2a4121cfe20712bd0fe1cf7a8a7 Mon Sep 17 00:00:00 2001 +From e6644bf0c58ccb2301d567590761fa1d5a860c68 Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Thu, 6 Aug 2020 11:20:41 +0200 Subject: [PATCH] misc: Add support for Intel Precise Touch & Stylus diff --git a/patches/5.12/0005-surface-sam-over-hid.patch b/patches/5.12/0005-surface-sam-over-hid.patch index 519ea8ca1..9af821a76 100644 --- a/patches/5.12/0005-surface-sam-over-hid.patch +++ b/patches/5.12/0005-surface-sam-over-hid.patch @@ -1,4 +1,4 @@ -From a94d814468ffc67b08b641c26379a58acfbbf1b6 Mon Sep 17 00:00:00 2001 +From 9c9e3cbb258bcd9ffa9d34d44fb7aeeba2706eb0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 25 Jul 2020 17:19:53 +0200 Subject: [PATCH] i2c: acpi: Implement RawBytes read access @@ -110,7 +110,7 @@ index 8ceaa88dd78f..deceed0d76c6 100644 -- 2.31.1 -From 25792e2ac56e0cd621ff71c38b4881b6a44ea76c Mon Sep 17 00:00:00 2001 +From 21aad0125779d4828050c4c6dc77cb24d0c10f62 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Sat, 13 Feb 2021 16:41:18 +0100 Subject: [PATCH] platform/surface: Add driver for Surface Book 1 dGPU switch diff --git a/patches/5.12/0006-surface-sam.patch b/patches/5.12/0006-surface-sam.patch index 00bff73f9..69804882b 100644 --- a/patches/5.12/0006-surface-sam.patch +++ b/patches/5.12/0006-surface-sam.patch @@ -1,4 +1,4 @@ -From 034c10f7c04684bba28833b3b8136368c9dc7527 Mon Sep 17 00:00:00 2001 +From 71af2529df7a873e906944e30c6ee2fd96276051 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:34 +0100 Subject: [PATCH] platform/surface: Set up Surface Aggregator device registry @@ -396,7 +396,7 @@ index 000000000000..a051d941ad96 -- 2.31.1 -From a09281921a27087db2d48580b5c09e56f62db2cd Mon Sep 17 00:00:00 2001 +From f9f59d226fdb643e6d136ddadc0040b594174623 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:35 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add base device hub @@ -725,7 +725,7 @@ index a051d941ad96..6c23d75a044c 100644 -- 2.31.1 -From 482f1bc858fde2c6a1fd330548500f08589240c6 Mon Sep 17 00:00:00 2001 +From 77d0eb721463484c22c7700355985aa3ff7e72c2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:36 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add battery subsystem @@ -814,7 +814,7 @@ index 6c23d75a044c..cde279692842 100644 -- 2.31.1 -From cdb9998251939f427f47b85846a5b1914f12b95c Mon Sep 17 00:00:00 2001 +From 9850764bc9908858c8ae0292fe0c07589803803f Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:37 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add platform profile @@ -916,7 +916,7 @@ index cde279692842..33904613dd4b 100644 -- 2.31.1 -From d30d9a3f6fe43f497aed8eae6a559a5f191bbab6 Mon Sep 17 00:00:00 2001 +From 64f866b5702ffb3fa8f1820753109af01ae271f5 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:38 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add DTX device @@ -960,7 +960,7 @@ index 33904613dd4b..dc044d06828b 100644 -- 2.31.1 -From f48e806ac0cb67eb06d61fc5adf4c7e5b7a89edd Mon Sep 17 00:00:00 2001 +From 31833a307a36926c7aebce35c7be4c08d1522ca5 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 12 Feb 2021 12:54:39 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add HID subsystem @@ -1056,7 +1056,7 @@ index dc044d06828b..caee90d135c5 100644 -- 2.31.1 -From da7ab6cbc069aa979b548d4aafb571e0e4125318 Mon Sep 17 00:00:00 2001 +From c130068f4a980f5d7ad6e655c9299cb1b747a7ba Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 11 Feb 2021 21:17:03 +0100 Subject: [PATCH] platform/surface: Add platform profile driver @@ -1342,7 +1342,7 @@ index 000000000000..0081b01a5b0f -- 2.31.1 -From 33f423309db2f55769a45acfd59063a8aebed1fc Mon Sep 17 00:00:00 2001 +From 2035a53463aa515cd76d615de6229f1ba4c02281 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Thu, 4 Mar 2021 20:05:24 +0100 Subject: [PATCH] platform/surface: aggregator: Make SSAM_DEFINE_SYNC_REQUEST_x @@ -1417,7 +1417,7 @@ index 26d13085a117..e519d374c378 100644 executing the specified request, using the device IDs and controller given in the client device. The full list of such macros for client devices is: diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index 5bcb59ed579d..aa6f37b4f46e 100644 +index 89761d3e1a47..88ec47cae5bf 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -1750,35 +1750,35 @@ EXPORT_SYMBOL_GPL(ssam_request_sync_with_buffer); @@ -1721,7 +1721,7 @@ index 02f3e06c0a60..4441ad667c3f 100644 -- 2.31.1 -From 7a07b11680d1d98ca77a55f37c5a38711b487ca5 Mon Sep 17 00:00:00 2001 +From 349394726da739c934ca9f67fecbd2ffed88e013 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 8 Mar 2021 19:48:17 +0100 Subject: [PATCH] platform/surface: Add DTX driver @@ -3216,7 +3216,7 @@ index 000000000000..0833aab0d819 -- 2.31.1 -From 3ac523ccd43bdde0b52426d255fbc50e00659605 Mon Sep 17 00:00:00 2001 +From a2fa661f97077f34d67468bbc645144f59134fe3 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 8 Mar 2021 19:48:18 +0100 Subject: [PATCH] platform/surface: dtx: Add support for native SSAM devices @@ -3360,7 +3360,7 @@ index 1301fab0ea14..85451eb94d98 100644 -- 2.31.1 -From d84ff64a1fa8dce47f3d60fa9ec98db43dcaaee0 Mon Sep 17 00:00:00 2001 +From bc764eb22303f1a8b5919abcf7b34fae0083519b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 8 Mar 2021 19:48:19 +0100 Subject: [PATCH] docs: driver-api: Add Surface DTX driver documentation @@ -4131,7 +4131,7 @@ index 3917e7363520..da1487d672a8 100644 -- 2.31.1 -From 1518f129b5389792afb8a311a11294668a5bf6e7 Mon Sep 17 00:00:00 2001 +From 2bab8e6866b5abd357b15d0941e35500957a8d08 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 9 Mar 2021 13:15:00 +0000 Subject: [PATCH] platform/surface: aggregator_registry: Make symbol @@ -4172,7 +4172,7 @@ index cdb4a95af3e8..86cff5fce3cd 100644 -- 2.31.1 -From cec31a9cad519c94fc89a33d9170629a2d310e52 Mon Sep 17 00:00:00 2001 +From 13c24e8cf534ee4c35a00486f11b696295181ffc Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 9 Mar 2021 17:25:50 +0100 Subject: [PATCH] platform/surface: aggregator_registry: Add support for @@ -4215,7 +4215,7 @@ index 86cff5fce3cd..eccb9d1007cd 100644 -- 2.31.1 -From 891b8f70fb304ab1ff3482d5aa929ea156996ff4 Mon Sep 17 00:00:00 2001 +From 14402dfc92f94872ecc684295d7ce91c0fc19ee4 Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Fri, 19 Mar 2021 13:19:19 +0800 Subject: [PATCH] platform/surface: fix semicolon.cocci warnings @@ -4254,7 +4254,7 @@ index 85451eb94d98..1fedacf74050 100644 -- 2.31.1 -From 0cd4b642ccb520ba5b9cac246da1ca2bb76216d7 Mon Sep 17 00:00:00 2001 +From eb6b89a681467ca6f9ab63e7b7ded69af2032c30 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 26 Mar 2021 15:28:48 +0300 Subject: [PATCH] platform/surface: clean up a variable in surface_dtx_read() @@ -4287,7 +4287,7 @@ index 1fedacf74050..63ce587e79e3 100644 -- 2.31.1 -From 81d6d2613cf852a1129960879d0ce6b7dae67755 Mon Sep 17 00:00:00 2001 +From 249d35e4c768ab3204232758bdcc1081512205d2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 6 Apr 2021 01:12:22 +0200 Subject: [PATCH] platform/surface: aggregator_registry: Give devices time to @@ -4530,7 +4530,7 @@ index eccb9d1007cd..685d37a7add1 100644 -- 2.31.1 -From 5177fd376432e132488109743f095ec3c47eafae Mon Sep 17 00:00:00 2001 +From a6be18a2e6a37d75b5fffd7fc19912d5b9a56944 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Wed, 3 Mar 2021 11:49:15 +1300 Subject: [PATCH] genirq: Add IRQF_NO_AUTOEN for request_irq/nmi() @@ -4632,7 +4632,7 @@ index 21ea370fccda..49288e941365 100644 -- 2.31.1 -From fdca7a09d5270022355cdde51b2f95317af1e6fa Mon Sep 17 00:00:00 2001 +From 92d7d1462eb709aed1a4620f0a2cf1b976f7a1b1 Mon Sep 17 00:00:00 2001 From: Tian Tao Date: Wed, 7 Apr 2021 15:00:52 +0800 Subject: [PATCH] platform/surface: aggregator: move to use request_irq by @@ -4655,7 +4655,7 @@ Patchset: surface-sam 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index aa6f37b4f46e..00e38284885a 100644 +index 88ec47cae5bf..69e86cd599d3 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -2483,7 +2483,8 @@ int ssam_irq_setup(struct ssam_controller *ctrl) @@ -4679,7 +4679,7 @@ index aa6f37b4f46e..00e38284885a 100644 -- 2.31.1 -From 7a2a06bd6598d33335519271102ab2f5722e0913 Mon Sep 17 00:00:00 2001 +From 5d87d26872336e61301f895710f7dcfd7e67c070 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 5 May 2021 14:53:45 +0200 Subject: [PATCH] platform/surface: aggregator: Do not mark interrupt as shared @@ -4697,7 +4697,7 @@ Patchset: surface-sam 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index 00e38284885a..1f42fcd5d8c3 100644 +index 69e86cd599d3..8a70df60142c 100644 --- a/drivers/platform/surface/aggregator/controller.c +++ b/drivers/platform/surface/aggregator/controller.c @@ -2483,8 +2483,7 @@ int ssam_irq_setup(struct ssam_controller *ctrl) @@ -4713,42 +4713,7 @@ index 00e38284885a..1f42fcd5d8c3 100644 -- 2.31.1 -From 71a7d75c951e4001b35779cf39f138487454362d Mon Sep 17 00:00:00 2001 -From: Dan Carpenter -Date: Tue, 20 Apr 2021 11:44:02 +0300 -Subject: [PATCH] platform/surface: aggregator: fix a bit test - -The "funcs" variable is a u64. If "func" is more than 31 then the -BIT() shift will wrap instead of testing the high bits. - -Fixes: c167b9c7e3d6 ("platform/surface: Add Surface Aggregator subsystem") -Reported-by: kernel test robot -Signed-off-by: Dan Carpenter -Reviewed-by: Maximilian Luz -Link: https://lore.kernel.org/r/YH6UUhJhGk3mk13b@mwanda -Signed-off-by: Hans de Goede -Patchset: surface-sam ---- - drivers/platform/surface/aggregator/controller.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/platform/surface/aggregator/controller.c b/drivers/platform/surface/aggregator/controller.c -index 1f42fcd5d8c3..8a70df60142c 100644 ---- a/drivers/platform/surface/aggregator/controller.c -+++ b/drivers/platform/surface/aggregator/controller.c -@@ -1040,7 +1040,7 @@ static int ssam_dsm_load_u32(acpi_handle handle, u64 funcs, u64 func, u32 *ret) - union acpi_object *obj; - u64 val; - -- if (!(funcs & BIT(func))) -+ if (!(funcs & BIT_ULL(func))) - return 0; /* Not supported, leave *ret at its default value */ - - obj = acpi_evaluate_dsm_typed(handle, &SSAM_SSH_DSM_GUID, --- -2.31.1 - -From 4bac02ecade55ad1c2dc1ebbca0510d8e05c8823 Mon Sep 17 00:00:00 2001 +From d8c132bd854d4950aa39dd6f7522b8d5cd0810c8 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 10 Mar 2021 23:53:28 +0100 Subject: [PATCH] HID: Add support for Surface Aggregator Module HID transport @@ -5495,7 +5460,7 @@ index 000000000000..4b1a7b57e035 -- 2.31.1 -From 61201d7c3512e3b7a74cb76f06db959e50a60d0f Mon Sep 17 00:00:00 2001 +From 340f05cab02d45f1b87906e007328b8b6bf29a51 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 10 Mar 2021 23:53:29 +0100 Subject: [PATCH] HID: surface-hid: Add support for legacy keyboard interface @@ -5866,7 +5831,7 @@ index 000000000000..0635341bc517 -- 2.31.1 -From 5b5d66c4569050cf2d15073cef9ec0fee33dfa3c Mon Sep 17 00:00:00 2001 +From cb0c6ca32fa6eef32a3de17d43d065e5ad45a40b Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Fri, 23 Apr 2021 00:51:22 +0200 Subject: [PATCH] HID: surface-hid: Fix integer endian conversion @@ -5905,7 +5870,7 @@ index 7b27ec392232..5571e74abe91 100644 -- 2.31.1 -From 3e16741959dfab7d9bbcab0c1c7f28f5cd5b598e Mon Sep 17 00:00:00 2001 +From b66f48a5c7a971a5fc0f41d5c96620f25c2df81d Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 6 Apr 2021 01:41:25 +0200 Subject: [PATCH] power: supply: Add battery driver for Surface Aggregator @@ -6887,7 +6852,7 @@ index 000000000000..4116dd839ecd -- 2.31.1 -From 4e25091e5ce472d91a7786010a1a00f4ed1a0374 Mon Sep 17 00:00:00 2001 +From 0b7e636936451ccf7e0bd7fa8c6e5331ffd53424 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 6 Apr 2021 01:41:26 +0200 Subject: [PATCH] power: supply: Add AC driver for Surface Aggregator Module @@ -7255,7 +7220,7 @@ index 000000000000..c2dd7e604d14 -- 2.31.1 -From 7feb809859bd62d4a0b10e7d0ce3bdfee5e51d16 Mon Sep 17 00:00:00 2001 +From b45091742f2fae559b4091a0c4d2a0660b03a98a Mon Sep 17 00:00:00 2001 From: Qiheng Lin Date: Sat, 10 Apr 2021 12:12:46 +0800 Subject: [PATCH] power: supply: surface-battery: Make some symbols static @@ -7304,7 +7269,7 @@ index 4116dd839ecd..7efa431a62b2 100644 -- 2.31.1 -From 1602265bbdfcc8368d48c3aa664e5b52fcea88da Mon Sep 17 00:00:00 2001 +From 6202c110bfad78f064d8687d5b433146cde21cd3 Mon Sep 17 00:00:00 2001 From: Qiheng Lin Date: Sat, 10 Apr 2021 12:12:49 +0800 Subject: [PATCH] power: supply: surface-charger: Make symbol @@ -7343,7 +7308,7 @@ index c2dd7e604d14..81a5b79822c9 100644 -- 2.31.1 -From 729ee99a1b2b0586c5699f96c0ad55926322c4a6 Mon Sep 17 00:00:00 2001 +From 47f3073898bb0e27542ec5dddca2816b44fdda5a Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 4 May 2021 20:00:46 +0200 Subject: [PATCH] power: supply: surface_battery: Fix battery event handling @@ -7400,7 +7365,7 @@ index 7efa431a62b2..5ec2e6bb2465 100644 -- 2.31.1 -From 36347fcfa36a6d6bfa89d75545c73d44704cf4db Mon Sep 17 00:00:00 2001 +From c747b2f975ecd2b3fe4e129ef6d644edfb1f8bda Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Tue, 11 May 2021 11:24:21 +0200 Subject: [PATCH] power: supply: surface-charger: Fix type of integer variable @@ -7432,7 +7397,7 @@ index 81a5b79822c9..a060c36c7766 100644 -- 2.31.1 -From 8a75f61f824d460381dde994c806f233ddccfd58 Mon Sep 17 00:00:00 2001 +From cc579fa79a6e8ebc837dc3e469210fcfc454191e Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 5 May 2021 18:17:04 +0200 Subject: [PATCH] serial: 8250_dw: Add device HID for new AMD UART controller @@ -7478,7 +7443,7 @@ index 9e204f9b799a..a3a0154da567 100644 -- 2.31.1 -From eebad61f66d0119629269d1d3eb2339f9e371192 Mon Sep 17 00:00:00 2001 +From c559b9d8aca9eab3a2c29bae5976404318f15e24 Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Wed, 5 May 2021 18:22:04 +0200 Subject: [PATCH] pinctrl/amd: Add device HID for new AMD GPIO controller @@ -7510,7 +7475,7 @@ index 2d4acf21117c..c5950a3b4e4c 100644 -- 2.31.1 -From 1bfc4a7ec82c4c2e25f568cf1b14b071bd5737c3 Mon Sep 17 00:00:00 2001 +From a09349d48459ca05841738c4c0a3be9c0072e9ce Mon Sep 17 00:00:00 2001 From: Maximilian Luz Date: Mon, 10 May 2021 23:33:17 +0200 Subject: [PATCH] x86/i8259: Work around buggy legacy PIC diff --git a/patches/5.12/0007-surface-hotplug.patch b/patches/5.12/0007-surface-hotplug.patch deleted file mode 100644 index 50dcdfb7a..000000000 --- a/patches/5.12/0007-surface-hotplug.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 448f0aaa69c07426f1df2ef96075d964545ef1c5 Mon Sep 17 00:00:00 2001 -From: "Rafael J. Wysocki" -Date: Tue, 16 Mar 2021 16:51:40 +0100 -Subject: [PATCH] PCI: PM: Do not read power state in pci_enable_device_flags() - -It should not be necessary to update the current_state field of -struct pci_dev in pci_enable_device_flags() before calling -do_pci_enable_device() for the device, because none of the -code between that point and the pci_set_power_state() call in -do_pci_enable_device() invoked later depends on it. - -Moreover, doing that is actively harmful in some cases. For example, -if the given PCI device depends on an ACPI power resource whose _STA -method initially returns 0 ("off"), but the config space of the PCI -device is accessible and the power state retrieved from the -PCI_PM_CTRL register is D0, the current_state field in the struct -pci_dev representing that device will get out of sync with the -power.state of its ACPI companion object and that will lead to -power management issues going forward. - -To avoid such issues it is better to leave the current_state value -as is until it is changed to PCI_D0 by do_pci_enable_device() as -appropriate. However, the power state of the device is not changed -to PCI_D0 if it is already enabled when pci_enable_device_flags() -gets called for it, so update its current_state in that case, but -use pci_update_current_state() covering platform PM too for that. - -Link: https://lore.kernel.org/lkml/20210314000439.3138941-1-luzmaximilian@gmail.com/ -Reported-by: Maximilian Luz -Tested-by: Maximilian Luz -Signed-off-by: Rafael J. Wysocki -Reviewed-by: Mika Westerberg -Patchset: surface-hotplug ---- - drivers/pci/pci.c | 16 +++------------- - 1 file changed, 3 insertions(+), 13 deletions(-) - -diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c -index 16a17215f633..e4d4e399004b 100644 ---- a/drivers/pci/pci.c -+++ b/drivers/pci/pci.c -@@ -1870,20 +1870,10 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags) - int err; - int i, bars = 0; - -- /* -- * Power state could be unknown at this point, either due to a fresh -- * boot or a device removal call. So get the current power state -- * so that things like MSI message writing will behave as expected -- * (e.g. if the device really is in D0 at enable time). -- */ -- if (dev->pm_cap) { -- u16 pmcsr; -- pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); -- dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK); -- } -- -- if (atomic_inc_return(&dev->enable_cnt) > 1) -+ if (atomic_inc_return(&dev->enable_cnt) > 1) { -+ pci_update_current_state(dev, dev->current_state); - return 0; /* already enabled */ -+ } - - bridge = pci_upstream_bridge(dev); - if (bridge) --- -2.31.1 - diff --git a/patches/5.12/0008-surface-typecover.patch b/patches/5.12/0007-surface-typecover.patch similarity index 99% rename from patches/5.12/0008-surface-typecover.patch rename to patches/5.12/0007-surface-typecover.patch index 974f205aa..709f06724 100644 --- a/patches/5.12/0008-surface-typecover.patch +++ b/patches/5.12/0007-surface-typecover.patch @@ -1,4 +1,4 @@ -From 0aaedb96792141016d48fc7fbd72034210c7d8e3 Mon Sep 17 00:00:00 2001 +From 122de5ff935f4a8ff52f8b4960a72a8c043343f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= Date: Thu, 5 Nov 2020 13:09:45 +0100 Subject: [PATCH] hid/multitouch: Turn off Type Cover keyboard backlight when diff --git a/patches/5.12/0009-cameras.patch b/patches/5.12/0008-cameras.patch similarity index 99% rename from patches/5.12/0009-cameras.patch rename to patches/5.12/0008-cameras.patch index 9a4b53c2e..f68a405bd 100644 --- a/patches/5.12/0009-cameras.patch +++ b/patches/5.12/0008-cameras.patch @@ -1,4 +1,4 @@ -From bf04fe3ba3be4b20c1e8369c8643684b203ca681 Mon Sep 17 00:00:00 2001 +From 591d6d107d8f1a4509370a6805b2507992568977 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:30 +0000 Subject: [PATCH] ACPI: scan: Extend acpi_walk_dep_device_list() @@ -250,7 +250,7 @@ index 3bdcfc4401b7..b560e47b700c 100644 -- 2.31.1 -From 409503747cb930cdfeb328880adc98236862bcd7 Mon Sep 17 00:00:00 2001 +From 33c9cac05908772acd83bf10c261f60602087f7c Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:31 +0000 Subject: [PATCH] ACPI: scan: Add function to fetch dependent of acpi device @@ -336,7 +336,7 @@ index 128eec2a26f6..d00dec1ad9fb 100644 -- 2.31.1 -From a29993fee73f417dd8b36b045101112dd31867a5 Mon Sep 17 00:00:00 2001 +From 08df91b22b4fec76672d805eeb9dce4b53fb06c2 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:32 +0000 Subject: [PATCH] i2c: core: Add a format macro for I2C device names @@ -397,7 +397,7 @@ index 56622658b215..4d40a4b46810 100644 -- 2.31.1 -From a91ba0ea34d24eb262ff75bae46fe51eb69413fe Mon Sep 17 00:00:00 2001 +From 003452ecb0e7726fe2442869ce6ac30182f33b29 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:33 +0000 Subject: [PATCH] gpiolib: acpi: Export acpi_get_gpiod() @@ -515,7 +515,7 @@ index c73b25bc9213..e26fb586b6c8 100644 -- 2.31.1 -From ac771f41046d43a093f905b1e0b858c225696e3e Mon Sep 17 00:00:00 2001 +From 3ab66500a16f4876900c8f82a1b96af94936c366 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:34 +0000 Subject: [PATCH] platform/x86: Add intel_skl_int3472 driver @@ -1596,7 +1596,7 @@ index 000000000000..d0d2391e263f -- 2.31.1 -From 095721552efd3875f2dba762d8b74bcd176409a3 Mon Sep 17 00:00:00 2001 +From c7b44f93abcfd82438c5b33d7383176be283a630 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 22 Feb 2021 13:07:35 +0000 Subject: [PATCH] mfd: tps68470: Remove tps68470 MFD driver @@ -1792,7 +1792,7 @@ index 4a4df4ffd18c..000000000000 -- 2.31.1 -From e14adf7e961ab1503c73538b190ce9ee850f7a08 Mon Sep 17 00:00:00 2001 +From 8b4111b5d20b51965c1561c4316615db387f4e33 Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 5 Apr 2021 23:56:53 +0100 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops @@ -1810,7 +1810,7 @@ Patchset: cameras 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c -index 6e8c0c230e11..21e4d0358cdc 100644 +index fecef85bd62e..9dafb9470708 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2-main.c @@ -1973,12 +1973,19 @@ static int __maybe_unused cio2_suspend(struct device *dev) @@ -1852,7 +1852,7 @@ index 6e8c0c230e11..21e4d0358cdc 100644 -- 2.31.1 -From 443bebed93d0d9b3cf37a92e420bcebe94c3f168 Mon Sep 17 00:00:00 2001 +From dbf58a64ff8155205e2b3d9a96e1af4ef58acafe Mon Sep 17 00:00:00 2001 From: Daniel Scally Date: Mon, 5 Apr 2021 23:56:54 +0100 Subject: [PATCH] media: i2c: Add support for ov5693 sensor @@ -3495,7 +3495,7 @@ index 000000000000..da2ca99a7ad3 -- 2.31.1 -From e66adb0c5a1cb4e4e1b075001e880dbc2018ea49 Mon Sep 17 00:00:00 2001 +From f0059d1809d52b6b42a7100efe9e26f9df1249f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Fri, 22 Jan 2021 20:58:13 +0100 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation @@ -3658,7 +3658,7 @@ index dd0ffcafa489..924d99d20328 100644 -- 2.31.1 -From 64bef4d8a0b27d957bdea394310bff6619b900e1 Mon Sep 17 00:00:00 2001 +From 7d1ac2ea2079508ce20b4bf694275a4947499be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Sun, 24 Jan 2021 11:07:42 +0100 Subject: [PATCH] cio2-bridge: Use macros and add warnings @@ -3762,7 +3762,7 @@ index 924d99d20328..e1e388cc9f45 100644 -- 2.31.1 -From 9c73954dc66cd31a19083f5861afe7c5af4fa1ea Mon Sep 17 00:00:00 2001 +From 117dcddf9a443ac3b7a579e7b427e3143e4d43c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= Date: Thu, 6 May 2021 07:52:44 +0200 Subject: [PATCH] cio2-bridge: Use correct dev_properties size