Update v5.13 patches

Changes:
 - Rebase onto v5.13.10
 - Update AMD PMC patches to latest version

Links:
 - kernel: https://github.com/linux-surface/kernel/commit/e6d532e20473095fe7486fc3a7e932c8028c1c8f
 - amd-pmc: https://patchwork.kernel.org/project/platform-driver-x86/list/?series=508431&state=%2A&archive=both

patches/5.13/0001-surface3-oemb.patch

@@ -1,4 +1,4 @@
-From ac64102d43f369f992b765d1696c97f819985c16 Mon Sep 17 00:00:00 2001
+From 78dbada84844419fc5362b23ec45a92bc80a7092 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

patches/5.13/0002-mwifiex.patch

@@ -1,4 +1,4 @@
-From a9d7775460dfb40528def873a14f8d0e4434f6aa Mon Sep 17 00:00:00 2001
+From 8501a32b56685c28db9e324deedb63ef3f1f4a67 Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 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.32.0
 
-From 514d9cf0ea9e12ddf6ef37f808edba6fd4981702 Mon Sep 17 00:00:00 2001
+From 053e52e9806a48401cc636f2a60bc6b811b717ec Mon Sep 17 00:00:00 2001
 From: Tsuchiya Yuto <kitakar@gmail.com>
 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.32.0
 
-From 38e2edd90f66c71be7e5ebf8a9eda666cbf5b703 Mon Sep 17 00:00:00 2001
+From 593af81e5a515bb0de3acc8ed613fefc50b3cce5 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
@@ -586,7 +586,7 @@ index 8b9dcb5070d8..3ef7440418e3 100644
 -- 
 2.32.0
 
-From 16d2c224054f65b17cfff6a0a28cc26dfface2d5 Mon Sep 17 00:00:00 2001
+From 94cd866ae26510bacc85261175cda8a0bd5c8072 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
@@ -648,7 +648,7 @@ index f0a6fa0a7ae5..34dcd84f02a6 100644
 -- 
 2.32.0
 
-From 7ade633333b6a9cba0f89e47fa7afb3657477b9e Mon Sep 17 00:00:00 2001
+From 78b462e0dc4f3bf37d69067d5fb708a4e14b502c 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+
@@ -803,7 +803,7 @@ index 3ef7440418e3..a95ebac06e13 100644
 -- 
 2.32.0
 
-From 04220a4840af7e9a636c263fb573bd5e133b54da Mon Sep 17 00:00:00 2001
+From 269a3d76334e884d65f469bd66ef8036a8c9fda8 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
@@ -970,7 +970,7 @@ index a95ebac06e13..4ec2ae72f632 100644
 -- 
 2.32.0
 
-From bc8d4c12a06c3608359df4f6d143f253a4d08f92 Mon Sep 17 00:00:00 2001
+From 17f7a771fec3a98c01548d0b9b7137b51c4d688e 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
@@ -1048,7 +1048,7 @@ index 6d23308119d1..31f255428b4b 100644
 -- 
 2.32.0
 
-From ebcc5071cf6e264aafdae92ff7b3b1ebf5424ae2 Mon Sep 17 00:00:00 2001
+From 58a82712a9464d3ebd3c32f8e5877c62e4caaf7b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 12:31:26 +0100
 Subject: [PATCH] mwifiex: Small cleanup for handling virtual interface type
@@ -1149,7 +1149,7 @@ index 0961f4a5e415..e8deba119ff1 100644
 -- 
 2.32.0
 
-From 4276f3ce117695cd77979f92e5764a70bd786e6d Mon Sep 17 00:00:00 2001
+From f0afb99270e0ff112d72d039ddae2cac2351d1bd 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
@@ -1206,7 +1206,7 @@ index 745946f5a519..9b62937111a1 100644
 -- 
 2.32.0
 
-From f60d7d06c33b5ac7a5a946ec5f1096a1c3f5ec1d Mon Sep 17 00:00:00 2001
+From 839c8b1c5ed2f1176a134c4e26006c106181a5ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 e8deba119ff1..dabc59c47de3 100644
 -- 
 2.32.0
 
-From 77ff1591c6b431c262573aeee121f29ec699f677 Mon Sep 17 00:00:00 2001
+From 345319ae30c7e249692fa31e6f1ee9f477567839 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 dabc59c47de3..146aabe14753 100644
 -- 
 2.32.0
 
-From b25d318e8e04cf3165084b4d6fb0dfacd6e62a91 Mon Sep 17 00:00:00 2001
+From 757a9119a1094bc8ee28ad23f18b65479a074280 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Wed, 11 Nov 2020 14:42:54 +0100
 Subject: [PATCH] mwifiex: Use helper function for counting interface types
@@ -1683,7 +1683,7 @@ index 146aabe14753..8b9517c243c8 100644
 -- 
 2.32.0
 
-From 5bdc1220f99981baccc9a232695f9685a5c22300 Mon Sep 17 00:00:00 2001
+From abeda8b23a1ffba8218f37257b1ff6b51aaf4006 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:56:58 +0100
 Subject: [PATCH] mwifiex: Update virtual interface counters right after
@@ -1786,7 +1786,7 @@ index 8b9517c243c8..f2797102c5a2 100644
 -- 
 2.32.0
 
-From f869633902bb7c9b62067467b36e82621f4194e0 Mon Sep 17 00:00:00 2001
+From 5513ecf38b4982d419ecf847561658075a32bb4b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 f2797102c5a2..ed4041ff9c89 100644
 -- 
 2.32.0
 
-From cd7a107d18372f2324f74ab959273824f90e3348 Mon Sep 17 00:00:00 2001
+From 004012c5c1e6a25cad887c65a7bd9d3ec8c628a7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 ed4041ff9c89..64caa5c4350d 100644
 -- 
 2.32.0
 
-From ac2df2bc620f9692690b40f33b62145d6e82bbda Mon Sep 17 00:00:00 2001
+From 5f55819a053c6a641da958f957cf50613418a6f7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Fri, 26 Mar 2021 15:32:16 +0100
 Subject: [PATCH] mwifiex: Properly initialize private structure on interface
@@ -1957,7 +1957,7 @@ index 64caa5c4350d..0eb31201a82b 100644
 -- 
 2.32.0
 
-From dd5226af437d01e529053108a24e76213dbccd1c Mon Sep 17 00:00:00 2001
+From fac8765acc32fd8dfe8f9773b7bab502131de87a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Sat, 27 Mar 2021 12:19:14 +0100
 Subject: [PATCH] mwifiex: Fix copy-paste mistake when creating virtual
@@ -1989,7 +1989,7 @@ index 0eb31201a82b..d62a20de3ada 100644
 -- 
 2.32.0
 
-From 8b53a1b47c05c34407933b6e8dd44c8031f71324 Mon Sep 17 00:00:00 2001
+From 6b65a04e8a407000fb9cd0797fc2e3f5a55d6dde Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 9b62937111a1..0a52549a1703 100644
 -- 
 2.32.0
 
-From ec9f467ee8cc7a8bc38c0cce06805d572e9e8ed7 Mon Sep 17 00:00:00 2001
+From dac74791b7a5eebace298da788e3d1b194902198 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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.32.0
 
-From 765180e267f38d4e0fb3149f2611976905fb5990 Mon Sep 17 00:00:00 2001
+From 4b6cf002c9a2bad2a58487fec3cf1ce1c1230742 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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.32.0
 
-From 9c575b42ef57e5d96608d35279ffe3c8dd8dd484 Mon Sep 17 00:00:00 2001
+From f84a3c2b54230353161615df7f490bc10fefe1ba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 d62a20de3ada..18b1a6d54bc8 100644
 -- 
 2.32.0
 
-From 0d0bd2ce7cc0b9af0308f61edee6acc35c3445f9 Mon Sep 17 00:00:00 2001
+From 33381d79c7bbdc4e9f5bd86921f288a1b25dacb7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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 18b1a6d54bc8..c00791701d78 100644
 -- 
 2.32.0
 
-From 734421a9ef6f9864a8221e49ce1a7b07518cc5a3 Mon Sep 17 00:00:00 2001
+From 1a7ffd5b44809e66aa89a9d89a03596a1c461320 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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.32.0
 
-From 2e55cb7733b6f83402add0698b202538f92d0f7c Mon Sep 17 00:00:00 2001
+From ffd4187cfd186446c02b6fedcd7361cb3bd8b112 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 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.32.0
 
-From 74240d026e86bc7adf91b4c2fb78f273a89e8f22 Mon Sep 17 00:00:00 2001
+From 66226cabe5f23b8dfafda0c2a3ce32a03137750e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
 Date: Tue, 13 Apr 2021 12:57:41 +0200
 Subject: [PATCH] mwifiex: Ignore BTCOEX events from the firmware

patches/5.13/0003-ath10k.patch

@@ -1,4 +1,4 @@
-From 7309cc2fe028a75c3ae50e9637a8e9ef2113b415 Mon Sep 17 00:00:00 2001
+From 07994c189276501e3395c3fa4e7b43784c9c6673 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

patches/5.13/0004-ipts.patch

@@ -1,4 +1,4 @@
-From 7149d04f9f8aab2beafc35af717077f898aa4f89 Mon Sep 17 00:00:00 2001
+From 9619d3ce1685b1c61ebea1c9e45ededfc0727b04 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 c3393b383e59..0098f98426c1 100644
 -- 
 2.32.0
 
-From 5f4e6d7e1f1c89258ca43d3be27e290f81f50d6a Mon Sep 17 00:00:00 2001
+From 19b6944f13543ad8cee02fff03e1497bd2ffc0f8 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

patches/5.13/0005-surface-sam-over-hid.patch

@@ -1,4 +1,4 @@
-From a283b02ab6ce5eb766ca4ddded88a4fb9e28017d Mon Sep 17 00:00:00 2001
+From 808d0569d0235cd6ddf6a357ae594321ff53a604 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 8ceaa88dd78f..deceed0d76c6 100644
 -- 
 2.32.0
 
-From 3074ef45ce9ba1491fd36271d09b4dcebda98b06 Mon Sep 17 00:00:00 2001
+From d24b23202a4432576048501d20a01d77f66104d6 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

patches/5.13/0006-surface-sam.patch

@@ -1,4 +1,4 @@
-From f2c4e41889483422e54a109d1572194db7e1fecc Mon Sep 17 00:00:00 2001
+From 04a4e1743aeaa6d5912006d9fb5a787747c139ba Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 23 May 2021 14:09:42 +0200
 Subject: [PATCH] platform/surface: aggregator_registry: Consolidate node
@@ -114,7 +114,7 @@ index ef83461fa536..4428c4330229 100644
 -- 
 2.32.0
 
-From 8c8153dba44ac8fac94a3aba187fc41020737c4c Mon Sep 17 00:00:00 2001
+From 2b45917556746a0920e60a8e654ff1e26c04170c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:49 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow registering notifiers
@@ -342,7 +342,7 @@ index 0806796eabcb..cf4bb48a850e 100644
 -- 
 2.32.0
 
-From 8cafd2042c5981cb2109ae99fc2c09f72fc57d6f Mon Sep 17 00:00:00 2001
+From 2e7e7cddb32f88879e4bcc9f7504581f0d89cb7c Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:50 +0200
 Subject: [PATCH] platform/surface: aggregator: Allow enabling of events
@@ -748,7 +748,7 @@ index cf4bb48a850e..7965bdc669c5 100644
 -- 
 2.32.0
 
-From f00f0a53697023db5a7df1c3f97ad0c6e93d94f5 Mon Sep 17 00:00:00 2001
+From 7765ef9ce459f49e9b2df1fae17297c873f4c3a5 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:51 +0200
 Subject: [PATCH] platform/surface: aggregator: Update copyright
@@ -1014,7 +1014,7 @@ index 64276fbfa1d5..c3de43edcffa 100644
 -- 
 2.32.0
 
-From e1ea701f13e38fd8f8eb80e245078a63676d3550 Mon Sep 17 00:00:00 2001
+From 8edbb6409b778e8aeefc7d16d94cbc520edf4c60 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:52 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Add support for forwarding
@@ -1713,7 +1713,7 @@ index fbcce04abfe9..4f393fafc235 100644
 -- 
 2.32.0
 
-From 2180c46e7b66ebe72e3e005561dfac431ec8bac0 Mon Sep 17 00:00:00 2001
+From b4e989188507b8c036d9f38fa59ad602aa33f150 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:53 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Allow enabling of events
@@ -1867,7 +1867,7 @@ index 4f393fafc235..08f46b60b151 100644
 -- 
 2.32.0
 
-From 01668133c96dcc93c98496d0f6487eb28bd136f8 Mon Sep 17 00:00:00 2001
+From cafa8a0553a25ba9082ec794b49fb32df2d272dc Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 15:47:54 +0200
 Subject: [PATCH] platform/surface: aggregator_cdev: Add lockdep support
@@ -1963,7 +1963,7 @@ index 7b86b36eaaa0..30fb50fde450 100644
 -- 
 2.32.0
 
-From bd3bebe9b2da209cc3d43bf1b4dda2a2c82d3f15 Mon Sep 17 00:00:00 2001
+From eb6bcd64aa4825c402d867748e2f07f45df1ee46 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Wed, 2 Jun 2021 20:07:47 +0200
 Subject: [PATCH] docs: driver-api: Update Surface Aggregator user-space
@@ -2141,7 +2141,7 @@ index 248c1372d879..0134a841a079 100644
 -- 
 2.32.0
 
-From b313404598b9edbd9cd4aa1f0dcd249c20a4b37b Mon Sep 17 00:00:00 2001
+From 40f3a12ba4d8f80414305ededa5ad694db335c3d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 23:09:06 +0200
 Subject: [PATCH] platform/surface: aggregator: Do not return uninitialized
@@ -2177,7 +2177,7 @@ index 6646f4d6e10d..634399387d76 100644
 -- 
 2.32.0
 
-From 081886bce6093dcf2e5e5846d2c0ba3da42c252b Mon Sep 17 00:00:00 2001
+From 252180ccf0325988a1d337e2852e2455c1b20d7e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 4 Jun 2021 23:09:07 +0200
 Subject: [PATCH] platform/surface: aggregator: Drop unnecessary variable
@@ -2210,7 +2210,7 @@ index 634399387d76..b8c377b3f932 100644
 -- 
 2.32.0
 
-From 1d23badd84bf25dd08c861b7c70a9d67f1a78597 Mon Sep 17 00:00:00 2001
+From 80886e8b2e61f396a276f30f81419213bc681b7e Mon Sep 17 00:00:00 2001
 From: Baokun Li <libaokun1@huawei.com>
 Date: Wed, 9 Jun 2021 15:26:38 +0800
 Subject: [PATCH] platform/surface: aggregator: Use list_move_tail instead of
@@ -2266,7 +2266,7 @@ index bfe1aaf38065..790f7f0eee98 100644
 -- 
 2.32.0
 
-From 3eb2a109216a2b4188ec4439271c47e1fd14f5c6 Mon Sep 17 00:00:00 2001
+From 61ce7792d52c67b3a8775f3ee7c1463ddecf2e09 Mon Sep 17 00:00:00 2001
 From: Baokun Li <libaokun1@huawei.com>
 Date: Wed, 9 Jun 2021 15:24:48 +0800
 Subject: [PATCH] platform/surface: aggregator: Use list_move_tail instead of

patches/5.13/0007-surface-hotplug.patch

@@ -1,4 +1,4 @@
-From 7226d638b95a39babcd3fd9823f1463c2b614b87 Mon Sep 17 00:00:00 2001
+From e6ef3f7ede2c6e9c1091874ebc6bce4e93c4f349 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Fri, 2 Jul 2021 15:51:07 +0200
 Subject: [PATCH] Revert "Revert "PCI: PM: Do not read power state in

patches/5.13/0008-surface-typecover.patch

@@ -1,4 +1,4 @@
-From c99aaa28eb1218ac6b03d17979aed60f25d15019 Mon Sep 17 00:00:00 2001
+From 1fb5af9a02fa8c3bf34c64e323355b17d5f5256b 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

patches/5.13/0009-cameras.patch

@@ -1,4 +1,4 @@
-From 992ebdb6f985a7d0c91b0da1e0f279baa0dcf705 Mon Sep 17 00:00:00 2001
+From 63bcf2aace6cf4409ce79d0c175068a52f281afe Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:02 +0100
 Subject: [PATCH] ACPI: scan: Extend acpi_walk_dep_device_list()
@@ -387,7 +387,7 @@ index c60745f657e9..170b9bebdb2b 100644
 -- 
 2.32.0
 
-From fd419272ad0a6de4e3b32329566f8d896ee67b64 Mon Sep 17 00:00:00 2001
+From dc8609e1902fded3bf2edb1c2658133a23a0db35 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:03 +0100
 Subject: [PATCH] ACPI: scan: Add function to fetch dependent of ACPI device
@@ -477,7 +477,7 @@ index b934c77b735f..db20595b24d1 100644
 -- 
 2.32.0
 
-From 0d7b8793e2bc3310305a0925cfe166fd670e66f2 Mon Sep 17 00:00:00 2001
+From 695ac1d8433d848e9671102d45a3225f03231c0e Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:04 +0100
 Subject: [PATCH] gpiolib: acpi: Introduce acpi_get_and_request_gpiod() helper
@@ -555,7 +555,7 @@ index c73b25bc9213..566feb56601f 100644
 -- 
 2.32.0
 
-From d0f92d8399e3cdd1f1d123f275080ae84ae13e44 Mon Sep 17 00:00:00 2001
+From 936a13d8a168703f99e7497213311a7fa9eb00cb Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:05 +0100
 Subject: [PATCH] gpiolib: acpi: Add acpi_gpio_get_io_resource()
@@ -634,7 +634,7 @@ index 170b9bebdb2b..e8ba7063c000 100644
 -- 
 2.32.0
 
-From 0954df3509b6d7846a1fe3a7e2141df56e356e9e Mon Sep 17 00:00:00 2001
+From b0f489ca21dc209e18fdc8d9fa3b25dfd18cae4c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:06 +0100
 Subject: [PATCH] platform/x86: Add intel_skl_int3472 driver
@@ -1779,7 +1779,7 @@ index 000000000000..c05b4cf502fe
 -- 
 2.32.0
 
-From 8e6a17c1fb9c65042c57a672723bb466263fdff2 Mon Sep 17 00:00:00 2001
+From 101fd2f3d1113d77594669aed785ef1ff7ece191 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 3 Jun 2021 23:40:07 +0100
 Subject: [PATCH] mfd: tps68470: Remove tps68470 MFD driver
@@ -1977,7 +1977,7 @@ index 4a4df4ffd18c..000000000000
 -- 
 2.32.0
 
-From 1be6852a35b534b0542abf12618d6eb607c9eb4a Mon Sep 17 00:00:00 2001
+From aca0fcff90502b507058ff5ba5be427f8e2232ff Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:10 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Free ACPI device resources
@@ -2037,7 +2037,7 @@ index 8c18dbff1c43..48a00a1f4fb6 100644
 -- 
 2.32.0
 
-From eaa1d370d53f858398d657512f9b859f46200fae Mon Sep 17 00:00:00 2001
+From 316ba204761ee9d481277d32fc410662c006daae Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:11 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Fix dependencies (drop
@@ -2071,7 +2071,7 @@ index c112878e833b..62e5d4cf9ee5 100644
 -- 
 2.32.0
 
-From 33a8c7b91485e32852f34bfa7f9c791432bc3295 Mon Sep 17 00:00:00 2001
+From b1933deab5124e3ee2b1229384e6299f9cf2346e Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:12 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Use ACPI GPIO resource
@@ -2234,7 +2234,7 @@ index 48a00a1f4fb6..fd681d2a73fe 100644
 -- 
 2.32.0
 
-From 3d5afe81a26b11d92fad45cd5df06d3e14fa757b Mon Sep 17 00:00:00 2001
+From f24f54b8d4472db020c5da2851229272f511e49e Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:13 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Provide
@@ -2308,7 +2308,7 @@ index fd681d2a73fe..2638d375e226 100644
 -- 
 2.32.0
 
-From e4d7031ea41df1c748c7dbfb34b0ef5d477f1d48 Mon Sep 17 00:00:00 2001
+From f82fd60530523b34f9db667d26f6c61a994789ff Mon Sep 17 00:00:00 2001
 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 Date: Fri, 18 Jun 2021 15:55:14 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Provide
@@ -2380,7 +2380,7 @@ index 2638d375e226..17c6fe830765 100644
 -- 
 2.32.0
 
-From ac9b97f812522a5883475806c01f8d428c918f06 Mon Sep 17 00:00:00 2001
+From e0bc07e6529bb006dae052461b847eba41c2ef3c Mon Sep 17 00:00:00 2001
 From: Dan Carpenter <dan.carpenter@oracle.com>
 Date: Fri, 25 Jun 2021 16:01:04 +0300
 Subject: [PATCH] platform/x86: intel_skl_int3472: Uninitialized variable in
@@ -2423,7 +2423,7 @@ index 17c6fe830765..9fe0a2527e1c 100644
 -- 
 2.32.0
 
-From fc185f6c395bf41efe922af66990c40457f1cdb0 Mon Sep 17 00:00:00 2001
+From 0666b4b09f1ba18c8d0e73ebc4ee10fd36be2063 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:53 +0100
 Subject: [PATCH] media: ipu3-cio2: Toggle sensor streaming in pm runtime ops
@@ -2483,7 +2483,7 @@ index fecef85bd62e..9dafb9470708 100644
 -- 
 2.32.0
 
-From 25d94cf625fb978843dde8abe1ddd540be6f9730 Mon Sep 17 00:00:00 2001
+From 53451bd20eef394112d0b752a4e77c266b3e5ca5 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 5 Apr 2021 23:56:54 +0100
 Subject: [PATCH] media: i2c: Add support for ov5693 sensor
@@ -4126,7 +4126,7 @@ index 000000000000..276f625d4d23
 -- 
 2.32.0
 
-From 0a7035eb212e9d9da9757ca3dfbe7f75db5fcb42 Mon Sep 17 00:00:00 2001
+From e3b2996cf22d4a41c012efa2550d830095efabc6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Fri, 22 Jan 2021 20:58:13 +0100
 Subject: [PATCH] cio2-bridge: Parse sensor orientation and rotation
@@ -4289,7 +4289,7 @@ index dd0ffcafa489..924d99d20328 100644
 -- 
 2.32.0
 
-From 7ba164dee392221e92d0e3f8c659232a21b65696 Mon Sep 17 00:00:00 2001
+From e074f4990cbeb18a569794c8e7ea14083c80a2ff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Sun, 24 Jan 2021 11:07:42 +0100
 Subject: [PATCH] cio2-bridge: Use macros and add warnings
@@ -4393,7 +4393,7 @@ index 924d99d20328..e1e388cc9f45 100644
 -- 
 2.32.0
 
-From 0c6db62f6fe848e23023036a363828d451e3f28e Mon Sep 17 00:00:00 2001
+From 0e629cd45fcfa9fc38c0f9e0acfbf3940d759b02 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20W=C3=BCthrich?= <me@fabwu.ch>
 Date: Thu, 6 May 2021 07:52:44 +0200
 Subject: [PATCH] cio2-bridge: Use correct dev_properties size
@@ -4419,7 +4419,7 @@ index e1e388cc9f45..deaf5804f70d 100644
 -- 
 2.32.0
 
-From fedcf87c56b1cac2ba8e91e1826bacdf4828e997 Mon Sep 17 00:00:00 2001
+From 4e25951863dbe702345ca02c81c7cc461cd54bce Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Thu, 20 May 2021 23:31:04 +0100
 Subject: [PATCH] media: i2c: Fix vertical flip in ov5693
@@ -4454,7 +4454,7 @@ index 276f625d4d23..1653fb49f6e0 100644
 -- 
 2.32.0
 
-From 711390dd56911d3c4f588b7add3098c99289662c Mon Sep 17 00:00:00 2001
+From eac34358e5195c73cd892034dfa8a9532c94a0bb Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 9 Jul 2021 16:39:18 +0100
 Subject: [PATCH] media: i2c: Add ACPI support to ov8865
@@ -4505,7 +4505,7 @@ index 9ecf180635ee..a28adf45b1b1 100644
 -- 
 2.32.0
 
-From e1a8ffd7826a949b81bfcd94ca187fc65bdbd03c Mon Sep 17 00:00:00 2001
+From 9515fb95ff6a695d0e03c3bd9a70547a221a6586 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 21:20:17 +0100
 Subject: [PATCH] media: i2c: Fix incorrect value in comment
@@ -4535,7 +4535,7 @@ index a28adf45b1b1..7d716b0d47c1 100644
 -- 
 2.32.0
 
-From 629626c88dd3b77a74d2fa05799d0e0618057fe1 Mon Sep 17 00:00:00 2001
+From 28f2f52005a1c3144e79f80f1116c29cf22f3200 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:21:52 +0100
 Subject: [PATCH] media: i2c: Check fwnode->secondary for endpoint
@@ -4584,7 +4584,7 @@ index 7d716b0d47c1..5fb290a6fc6a 100644
 -- 
 2.32.0
 
-From 37752b11a384ee1533a2f65a4f04e56237a53e00 Mon Sep 17 00:00:00 2001
+From 3d1891c5bc2413c9c4cb31cb539e24104b4ac140 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:00:25 +0100
 Subject: [PATCH] media: i2c: Support 19.2MHz input clock in ov8865
@@ -4899,7 +4899,7 @@ index 5fb290a6fc6a..cae7dc9da49d 100644
 -- 
 2.32.0
 
-From 24ae18706c8fb7e9a05b2150449bcc24c3e0ef9a Mon Sep 17 00:00:00 2001
+From 10bc9f644e7dd7694fde1279ea71cde091135ce3 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:19:10 +0100
 Subject: [PATCH] media: i2c: Add .get_selection() support to ov8865
@@ -5001,7 +5001,7 @@ index cae7dc9da49d..3ce0af7e0054 100644
 -- 
 2.32.0
 
-From f1ffe1afe14cc4c8385d4fe8cd606bee98f8511d Mon Sep 17 00:00:00 2001
+From b2f2f9b94724ff52e1612916cf33af2a0c89b9d6 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Sat, 10 Jul 2021 22:34:43 +0100
 Subject: [PATCH] media: i2c: Switch control to V4L2_CID_ANALOGUE_GAIN
@@ -5052,7 +5052,7 @@ index 3ce0af7e0054..c0c6b1d7e1ed 100644
 -- 
 2.32.0
 
-From b10af323ddb3a2dc6f95a05bd9f6a4c978dece7a Mon Sep 17 00:00:00 2001
+From d92423de7cfe29a3d32d1ee5ce7f0cc6e40bd383 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Mon, 12 Jul 2021 22:54:56 +0100
 Subject: [PATCH] media: i2c: Add vblank control to ov8865
@@ -5162,7 +5162,7 @@ index c0c6b1d7e1ed..5f67d85e33bc 100644
 -- 
 2.32.0
 
-From 12b0a5983a2a68eb62e699461ed177055d921c30 Mon Sep 17 00:00:00 2001
+From 9a0ad222442e2106bd16b99ee69518f61b6eea29 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:40:33 +0100
 Subject: [PATCH] media: i2c: Add hblank control to ov8865
@@ -5232,7 +5232,7 @@ index 5f67d85e33bc..66754ff62a22 100644
 -- 
 2.32.0
 
-From 85955f09830ee494217b2a18837d4f2e95ac0330 Mon Sep 17 00:00:00 2001
+From 5adb1a1d9e38a6d49ef17c15170bd2480eddf843 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Tue, 13 Jul 2021 23:43:17 +0100
 Subject: [PATCH] media: i2c: cap exposure at height + vblank in ov8865
@@ -5313,7 +5313,7 @@ index 66754ff62a22..93e741952050 100644
 -- 
 2.32.0
 
-From f141e7e2bcd392b10d7f82987a8a1a8c49e71580 Mon Sep 17 00:00:00 2001
+From 1056369b3230f08fbb89207735759a016f36ade8 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 18:05:44 +0100
 Subject: [PATCH] media: i2c: Remove unused macros from ov8865
@@ -5587,7 +5587,7 @@ index 93e741952050..fd4de2ea1fa9 100644
 -- 
 2.32.0
 
-From bb55cff958fd4bf64468164e3f0ad8a0647812b2 Mon Sep 17 00:00:00 2001
+From 529fd9dac27723500bab8f10f0095c1f40ffab3a Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 00:00:54 +0100
 Subject: [PATCH] media: i2c: Switch exposure control unit to lines
@@ -5634,7 +5634,7 @@ index fd4de2ea1fa9..1905028742d5 100644
 -- 
 2.32.0
 
-From 176728ce39603458d35dcbfbb1dee1d330ff5f62 Mon Sep 17 00:00:00 2001
+From 96271b1dac968eb5318d340c6fc86e1df28c512c Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Fri, 16 Jul 2021 22:56:15 +0100
 Subject: [PATCH] media: i2c: Add controls from fwnode to ov8865
@@ -5679,7 +5679,7 @@ index 1905028742d5..e88825ea76aa 100644
 -- 
 2.32.0
 
-From 837f53b7af8a7c9d8ff7c3ad3917df3842e7d099 Mon Sep 17 00:00:00 2001
+From e9ceed48b56cf6f3faddc423de5c9a7ddad59c02 Mon Sep 17 00:00:00 2001
 From: Daniel Scally <djrscally@gmail.com>
 Date: Wed, 14 Jul 2021 00:05:04 +0100
 Subject: [PATCH] media: ipu3-cio2: Add INT347A to cio2-bridge

patches/5.13/0010-amd-gpio.patch

@@ -1,4 +1,4 @@
-From b80421e31b97978ab5bf2ce70f0bb401e8a5924d Mon Sep 17 00:00:00 2001
+From 0c5c8f5be3f03fd536ccc576b2259a31b9fa7b0f 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 e90310cbe73a..d89aebf69ce1 100644
 -- 
 2.32.0
 
-From b223d7904aef22d1f4aa2f484a81f1604dbb72d1 Mon Sep 17 00:00:00 2001
+From c39233319a8106c44b6baadf7e0c4c7efc0e023f 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

patches/5.13/0011-amd-s0ix.patch

@@ -1,4 +1,4 @@
-From 4889855e48e5dc7465e8f187cf955bb681738750 Mon Sep 17 00:00:00 2001
+From fc0e880581864996091eb1493106cfa688499e54 Mon Sep 17 00:00:00 2001
 From: Sachi King <nakato@nakato.io>
 Date: Sat, 29 May 2021 22:27:25 +1000
 Subject: [PATCH] platform/x86: amd-pmc: Add device HID for AMD PMC
@@ -17,10 +17,10 @@ Patchset: amd-s0ix
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index b9da58ee9b1e..0b5578a8a449 100644
+index ca95c2a52e26..65a81d295beb 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
-@@ -275,6 +275,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
+@@ -299,6 +299,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
  static const struct acpi_device_id amd_pmc_acpi_ids[] = {
  	{"AMDI0005", 0},
  	{"AMD0004", 0},
@@ -31,7 +31,7 @@ index b9da58ee9b1e..0b5578a8a449 100644
 -- 
 2.32.0
 
-From 504c00ecbf80aba3f61abb48fe2c10ba3ca4424e Mon Sep 17 00:00:00 2001
+From b7decf4829b6fc0eee95391b7586ef4f358d0665 Mon Sep 17 00:00:00 2001
 From: Marcin Bachry <hegel666@gmail.com>
 Date: Tue, 16 Mar 2021 15:28:51 -0400
 Subject: [PATCH] PCI: quirks: Quirk PCI d3hot delay for AMD xhci
@@ -62,7 +62,7 @@ index 6d74386eadc2..446f8f7b0ee4 100644
 -- 
 2.32.0
 
-From 618a6568b8c78aa76b948de4523661c1b32eb2ef Mon Sep 17 00:00:00 2001
+From 9aa59beca56f76169a52013ee2373fe544d90ec5 Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <mario.limonciello@amd.com>
 Date: Wed, 9 Jun 2021 13:40:17 -0500
 Subject: [PATCH] ACPI: Check StorageD3Enable _DSD property in ACPI code
@@ -199,7 +199,7 @@ index e8ba7063c000..66c43abef4a4 100644
 -- 
 2.32.0
 
-From 96f363d1fd7c2c84c34a56cc1f46428379b7dad5 Mon Sep 17 00:00:00 2001
+From 42069e4fbfb7443575d45864ce21fd97810dc354 Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <mario.limonciello@amd.com>
 Date: Wed, 9 Jun 2021 13:40:18 -0500
 Subject: [PATCH] ACPI: Add quirks for AMD Renoir/Lucienne CPUs to force the D3
@@ -322,7 +322,7 @@ index bdc1ba00aee9..5298bb4d81fe 100644
 -- 
 2.32.0
 
-From 5f752254fac28f8c15b6c3c257e6e71e3aaae907 Mon Sep 17 00:00:00 2001
+From 7e06f35deb6284d96879a6a58b84a421aff69b8f Mon Sep 17 00:00:00 2001
 From: Alex Deucher <alexander.deucher@amd.com>
 Date: Wed, 17 Mar 2021 10:38:42 -0400
 Subject: [PATCH] platform/x86: force LPS0 functions for AMD
@@ -364,113 +364,65 @@ index 2d7ddb8a8cb6..482e6b23b21a 100644
 -- 
 2.32.0
 
-From 44dfe6c38ca8066e141e0a70cd7205ad4887e7eb Mon Sep 17 00:00:00 2001
-From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:35 +0530
-Subject: [PATCH] platform/x86: amd-pmc: Fix command completion code
-
-The protocol to submit a job request to SMU is to wait for
-AMD_PMC_REGISTER_RESPONSE to return 1,meaning SMU is ready to take
-requests. PMC driver has to make sure that the response code is always
-AMD_PMC_RESULT_OK before making any command submissions.
+From bd205b477ba24671f8e09be2c467de750b7c73ab Mon Sep 17 00:00:00 2001
+From: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
+Date: Thu, 17 Jun 2021 11:42:08 -0500
+Subject: [PATCH] ACPI: PM: s2idle: Use correct revision id
 
-Also, when we submit a message to SMU, we have to wait until it processes
-the request. Adding a read_poll_timeout() check as this was missing in
-the existing code.
+AMD spec mentions only revision 0. With this change,
+device constraint list is populated properly.
 
-Fixes: 156ec4731cb2 ("platform/x86: amd-pmc: Add AMD platform support for S2Idle")
-Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
 Patchset: amd-s0ix
 ---
- drivers/platform/x86/amd-pmc.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ drivers/acpi/x86/s2idle.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index 0b5578a8a449..535e431f98a8 100644
---- a/drivers/platform/x86/amd-pmc.c
-+++ b/drivers/platform/x86/amd-pmc.c
-@@ -140,7 +140,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
+diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
+index 482e6b23b21a..4339e6da0dd6 100644
+--- a/drivers/acpi/x86/s2idle.c
++++ b/drivers/acpi/x86/s2idle.c
+@@ -96,7 +96,7 @@ static void lpi_device_get_constraints_amd(void)
+ 	int i, j, k;
  
- 	/* Wait until we get a valid response */
- 	rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE,
--				val, val > 0, PMC_MSG_DELAY_MIN_US,
-+				val, val == AMD_PMC_RESULT_OK, PMC_MSG_DELAY_MIN_US,
- 				PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
- 	if (rc) {
- 		dev_err(dev->dev, "failed to talk to SMU\n");
-@@ -156,6 +156,14 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
- 	/* Write message ID to message ID register */
- 	msg = (dev->cpu_id == AMD_CPU_ID_RN) ? MSG_OS_HINT_RN : MSG_OS_HINT_PCO;
- 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg);
-+	/* Wait until we get a valid response */
-+	rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE,
-+				val, val == AMD_PMC_RESULT_OK, PMC_MSG_DELAY_MIN_US,
-+				PMC_MSG_DELAY_MIN_US * RESPONSE_REGISTER_LOOP_MAX);
-+	if (rc) {
-+		dev_err(dev->dev, "SMU response timed out\n");
-+		return rc;
-+	}
- 	return 0;
- }
+ 	out_obj = acpi_evaluate_dsm_typed(lps0_device_handle, &lps0_dsm_guid,
+-					  1, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
++					  rev_id, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
+ 					  NULL, ACPI_TYPE_PACKAGE);
  
+ 	if (!out_obj)
 -- 
 2.32.0
 
-From 8a033f828c0dc65626f041e4377a8563c8fcc4b0 Mon Sep 17 00:00:00 2001
+From d02cfd1749187cd8dc7997a9268a5d6629a2f31a Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:36 +0530
-Subject: [PATCH] platform/x86: amd-pmc: Fix SMU firmware reporting mechanism
-
-It was lately understood that the current mechanism available in the
-driver to get SMU firmware info works only on internal SMU builds and
-there is a separate way to get all the SMU logging counters (addressed
-in the next patch). Hence remove all the smu info shown via debugfs as it
-is no more useful.
+Date: Tue, 29 Jun 2021 14:17:59 +0530
+Subject: [PATCH] platform/x86: amd-pmc: call dump registers only once
 
-Also, use dump registers routine only at one place i.e. after the command
-submission to SMU is done.
+Currently amd_pmc_dump_registers() routine is being called at
+multiple places. The best to call it is after command submission
+to SMU.
 
-Fixes: 156ec4731cb2 ("platform/x86: amd-pmc: Add AMD platform support for S2Idle")
 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Patchset: amd-s0ix
 ---
- drivers/platform/x86/amd-pmc.c | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
+ drivers/platform/x86/amd-pmc.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index 535e431f98a8..d32f0a0eeb9f 100644
+index 65a81d295beb..d08ff5907e4c 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
-@@ -52,7 +52,6 @@
- #define AMD_CPU_ID_PCO			AMD_CPU_ID_RV
- #define AMD_CPU_ID_CZN			AMD_CPU_ID_RN
+@@ -182,6 +182,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
  
--#define AMD_SMU_FW_VERSION		0x0
- #define PMC_MSG_DELAY_MIN_US		100
- #define RESPONSE_REGISTER_LOOP_MAX	200
- 
-@@ -88,11 +87,6 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
- #ifdef CONFIG_DEBUG_FS
- static int smu_fw_info_show(struct seq_file *s, void *unused)
- {
--	struct amd_pmc_dev *dev = s->private;
--	u32 value;
--
--	value = ioread32(dev->smu_base + AMD_SMU_FW_VERSION);
--	seq_printf(s, "SMU FW Info: %x\n", value);
- 	return 0;
- }
- DEFINE_SHOW_ATTRIBUTE(smu_fw_info);
-@@ -164,6 +158,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
- 		dev_err(dev->dev, "SMU response timed out\n");
- 		return rc;
- 	}
+ out_unlock:
+ 	mutex_unlock(&dev->lock);
 +	amd_pmc_dump_registers(dev);
- 	return 0;
+ 	return rc;
  }
  
-@@ -176,7 +171,6 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
+@@ -194,7 +195,6 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
  	if (rc)
  		dev_err(pdev->dev, "suspend failed\n");
  
@@ -478,7 +430,7 @@ index 535e431f98a8..d32f0a0eeb9f 100644
  	return 0;
  }
  
-@@ -189,7 +183,6 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
+@@ -207,7 +207,6 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
  	if (rc)
  		dev_err(pdev->dev, "resume failed\n");
  
@@ -486,30 +438,21 @@ index 535e431f98a8..d32f0a0eeb9f 100644
  	return 0;
  }
  
-@@ -256,17 +249,11 @@ static int amd_pmc_probe(struct platform_device *pdev)
- 	pci_dev_put(rdev);
- 	base_addr = ((u64)base_addr_hi << 32 | base_addr_lo);
- 
--	dev->smu_base = devm_ioremap(dev->dev, base_addr, AMD_PMC_MAPPING_SIZE);
--	if (!dev->smu_base)
--		return -ENOMEM;
--
- 	dev->regbase = devm_ioremap(dev->dev, base_addr + AMD_PMC_BASE_ADDR_OFFSET,
- 				    AMD_PMC_MAPPING_SIZE);
+@@ -279,8 +278,6 @@ static int amd_pmc_probe(struct platform_device *pdev)
  	if (!dev->regbase)
  		return -ENOMEM;
  
 -	amd_pmc_dump_registers(dev);
 -
+ 	mutex_init(&dev->lock);
  	platform_set_drvdata(pdev, dev);
  	amd_pmc_dbgfs_register(dev);
- 	return 0;
 -- 
 2.32.0
 
-From 6a0392fde32139f2a8d3d354fed6b145fa4f3e15 Mon Sep 17 00:00:00 2001
+From 9367cb28c141d148d626c81d6109b08abb6caa31 Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:37 +0530
+Date: Tue, 29 Jun 2021 14:18:00 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add support for logging SMU metrics
 
 SMU provides a way to dump the s0ix debug statistics in the form of a
@@ -523,13 +466,14 @@ As a side note, SMU subsystem logging is not supported on Picasso based
 SoC's.
 
 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Patchset: amd-s0ix
 ---
- drivers/platform/x86/amd-pmc.c | 148 +++++++++++++++++++++++++++++++--
- 1 file changed, 140 insertions(+), 8 deletions(-)
+ drivers/platform/x86/amd-pmc.c | 147 +++++++++++++++++++++++++++++++--
+ 1 file changed, 139 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index d32f0a0eeb9f..b5249fdeb95f 100644
+index d08ff5907e4c..cfa5c44bb170 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
 @@ -46,6 +46,14 @@
@@ -589,9 +533,9 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  	u32 cpu_id;
 +	u32 active_ips;
  	struct device *dev;
+ 	struct mutex lock; /* generic mutex lock */
  #if IS_ENABLED(CONFIG_DEBUG_FS)
- 	struct dentry *dbgfs_dir;
-@@ -73,6 +106,7 @@ struct amd_pmc_dev {
+@@ -74,6 +107,7 @@ struct amd_pmc_dev {
  };
  
  static struct amd_pmc_dev pmc;
@@ -599,7 +543,7 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  
  static inline u32 amd_pmc_reg_read(struct amd_pmc_dev *dev, int reg_offset)
  {
-@@ -84,9 +118,50 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
+@@ -85,9 +119,49 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
  	iowrite32(val, dev->regbase + reg_offset);
  }
  
@@ -625,7 +569,6 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  {
 +	struct amd_pmc_dev *dev = s->private;
 +	struct smu_metrics table;
-+	u32 value;
 +	int idx;
 +
 +	if (dev->cpu_id == AMD_CPU_ID_PCO)
@@ -650,7 +593,7 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  	return 0;
  }
  DEFINE_SHOW_ATTRIBUTE(smu_fw_info);
-@@ -112,6 +187,32 @@ static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
+@@ -113,6 +187,32 @@ static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
  }
  #endif /* CONFIG_DEBUG_FS */
  
@@ -683,7 +626,7 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
  {
  	u32 value;
-@@ -126,10 +227,9 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
+@@ -127,10 +227,9 @@ static void amd_pmc_dump_registers(struct amd_pmc_dev *dev)
  	dev_dbg(dev->dev, "AMD_PMC_REGISTER_MESSAGE:%x\n", value);
  }
  
@@ -694,8 +637,8 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
 -	u8 msg;
  	u32 val;
  
- 	/* Wait until we get a valid response */
-@@ -148,8 +248,8 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
+ 	mutex_lock(&dev->lock);
+@@ -150,8 +249,8 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
  	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set);
  
  	/* Write message ID to message ID register */
@@ -704,20 +647,21 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
 +
  	/* Wait until we get a valid response */
  	rc = readx_poll_timeout(ioread32, dev->regbase + AMD_PMC_REGISTER_RESPONSE,
- 				val, val == AMD_PMC_RESULT_OK, PMC_MSG_DELAY_MIN_US,
-@@ -158,16 +258,40 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
- 		dev_err(dev->dev, "SMU response timed out\n");
- 		return rc;
- 	}
-+
-+	if (ret) {
-+		/* PMFW may take longer time to return back the data */
-+		usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US);
-+		*data = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_ARGUMENT);
-+	}
-+
- 	amd_pmc_dump_registers(dev);
- 	return 0;
+ 				val, val != 0, PMC_MSG_DELAY_MIN_US,
+@@ -163,6 +262,11 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
+ 
+ 	switch (val) {
+ 	case AMD_PMC_RESULT_OK:
++		if (ret) {
++			/* PMFW may take longer time to return back the data */
++			usleep_range(DELAY_MIN_US, 10 * DELAY_MAX_US);
++			*data = amd_pmc_reg_read(dev, AMD_PMC_REGISTER_ARGUMENT);
++		}
+ 		break;
+ 	case AMD_PMC_RESULT_CMD_REJECT_BUSY:
+ 		dev_err(dev->dev, "SMU not ready. err: 0x%x\n", val);
+@@ -186,12 +290,29 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set)
+ 	return rc;
  }
  
 +static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
@@ -736,33 +680,33 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  	struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
  	int rc;
 +	u8 msg;
-+
+ 
+-	rc = amd_pmc_send_cmd(pdev, 1);
 +	/* Reset and Start SMU logging - to monitor the s0i3 stats */
 +	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0);
 +	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0);
- 
--	rc = amd_pmc_send_cmd(pdev, 1);
++
 +	msg = amd_pmc_get_os_hint(pdev);
 +	rc = amd_pmc_send_cmd(pdev, 1, NULL, msg, 0);
  	if (rc)
  		dev_err(pdev->dev, "suspend failed\n");
  
-@@ -178,8 +302,13 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
+@@ -202,8 +323,13 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
  {
  	struct amd_pmc_dev *pdev = dev_get_drvdata(dev);
  	int rc;
 +	u8 msg;
-+
-+	/* Let SMU know that we are looking for stats */
-+	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
  
 -	rc = amd_pmc_send_cmd(pdev, 0);
++	/* Let SMU know that we are looking for stats */
++	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_DUMP_DATA, 0);
++
 +	msg = amd_pmc_get_os_hint(pdev);
 +	rc = amd_pmc_send_cmd(pdev, 0, NULL, msg, 0);
  	if (rc)
  		dev_err(pdev->dev, "resume failed\n");
  
-@@ -202,8 +331,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
+@@ -226,8 +352,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
  {
  	struct amd_pmc_dev *dev = &pmc;
  	struct pci_dev *rdev;
@@ -772,24 +716,26 @@ index d32f0a0eeb9f..b5249fdeb95f 100644
  	u64 base_addr;
  	int err;
  	u32 val;
-@@ -254,6 +382,10 @@ static int amd_pmc_probe(struct platform_device *pdev)
- 	if (!dev->regbase)
+@@ -279,6 +404,12 @@ static int amd_pmc_probe(struct platform_device *pdev)
  		return -ENOMEM;
  
+ 	mutex_init(&dev->lock);
++
 +	/* Use SMU to get the s0i3 debug stats */
 +	err = amd_pmc_setup_smu_logging(dev);
 +	if (err)
 +		dev_err(dev->dev, "SMU debugging info not supported on this platform\n");
++
  	platform_set_drvdata(pdev, dev);
  	amd_pmc_dbgfs_register(dev);
  	return 0;
 -- 
 2.32.0
 
-From 5fefd0eb9254e2162a2cc896d410c9bf3b7f6a8a Mon Sep 17 00:00:00 2001
+From 392e1a4e917612d31b844402838a5579ac69a53c Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:38 +0530
-Subject: [PATCH] platform/x86: amd-pmc: Add support for logging s0ix counters
+Date: Tue, 29 Jun 2021 14:18:01 +0530
+Subject: [PATCH] amd-pmc: Add support for logging s0ix counters
 
 Even the FCH SSC registers provides certain level of information
 about the s0ix entry and exit times which comes handy when the SMU
@@ -803,13 +749,14 @@ If s0ix entry time and exit time don't change during suspend to idle,
 the silicon has not entered the deepest state.
 
 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Patchset: amd-s0ix
 ---
- drivers/platform/x86/amd-pmc.c | 46 ++++++++++++++++++++++++++++++++--
- 1 file changed, 44 insertions(+), 2 deletions(-)
+ drivers/platform/x86/amd-pmc.c | 45 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 44 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index b5249fdeb95f..b6ad290c9a86 100644
+index cfa5c44bb170..d1db12e28b32 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
 @@ -46,6 +46,15 @@
@@ -836,15 +783,7 @@ index b5249fdeb95f..b6ad290c9a86 100644
  	u32 base_addr;
  	u32 cpu_id;
  	u32 active_ips;
-@@ -140,7 +150,6 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
- {
- 	struct amd_pmc_dev *dev = s->private;
- 	struct smu_metrics table;
--	u32 value;
- 	int idx;
- 
- 	if (dev->cpu_id == AMD_CPU_ID_PCO)
-@@ -166,6 +175,29 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
+@@ -166,6 +176,29 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
  }
  DEFINE_SHOW_ATTRIBUTE(smu_fw_info);
  
@@ -859,8 +798,8 @@ index b5249fdeb95f..b6ad290c9a86 100644
 +	exit_time = ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_H_OFFSET);
 +	exit_time = exit_time << 32 | ioread32(dev->fch_virt_addr + FCH_S0I3_EXIT_TIME_L_OFFSET);
 +
-+	/* It's in 48MHz. We need to convert it to unit of 100ns */
-+	residency = (exit_time - entry_time) * 10 / 48;
++	/* It's in 48MHz. We need to convert it */
++	residency = (exit_time - entry_time) / 48;
 +
 +	seq_puts(s, "=== S0ix statistics ===\n");
 +	seq_printf(s, "S0ix Entry Time: %lld\n", entry_time);
@@ -874,7 +813,7 @@ index b5249fdeb95f..b6ad290c9a86 100644
  static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
  {
  	debugfs_remove_recursive(dev->dbgfs_dir);
-@@ -176,6 +208,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
+@@ -176,6 +209,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
  	dev->dbgfs_dir = debugfs_create_dir("amd_pmc", NULL);
  	debugfs_create_file("smu_fw_info", 0644, dev->dbgfs_dir, dev,
  			    &smu_fw_info_fops);
@@ -883,7 +822,7 @@ index b5249fdeb95f..b6ad290c9a86 100644
  }
  #else
  static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
-@@ -332,7 +366,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
+@@ -353,7 +388,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
  	struct amd_pmc_dev *dev = &pmc;
  	struct pci_dev *rdev;
  	u32 base_addr_lo, base_addr_hi;
@@ -892,9 +831,9 @@ index b5249fdeb95f..b6ad290c9a86 100644
  	int err;
  	u32 val;
  
-@@ -382,6 +416,14 @@ static int amd_pmc_probe(struct platform_device *pdev)
- 	if (!dev->regbase)
- 		return -ENOMEM;
+@@ -405,6 +440,14 @@ static int amd_pmc_probe(struct platform_device *pdev)
+ 
+ 	mutex_init(&dev->lock);
  
 +	/* Use FCH registers to get the S0ix stats */
 +	base_addr_lo = FCH_BASE_PHY_ADDR_LOW;
@@ -910,25 +849,26 @@ index b5249fdeb95f..b6ad290c9a86 100644
 -- 
 2.32.0
 
-From c2a925c50d1b8c2fbb69f00eb876e77861f4b088 Mon Sep 17 00:00:00 2001
+From d49720e8fb987ec9acd4c761e6840f3e4e6708cc Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:39 +0530
+Date: Tue, 29 Jun 2021 14:18:02 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add support for ACPI ID AMDI0006
 
 Some newer BIOSes have added another ACPI ID for the uPEP device.
 SMU statistics behave identically on this device.
 
 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Patchset: amd-s0ix
 ---
  drivers/platform/x86/amd-pmc.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index b6ad290c9a86..2a73fe0deaf3 100644
+index d1db12e28b32..b8740daecd7b 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
-@@ -443,6 +443,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
+@@ -469,6 +469,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
  
  static const struct acpi_device_id amd_pmc_acpi_ids[] = {
  	{"AMDI0005", 0},
@@ -939,9 +879,9 @@ index b6ad290c9a86..2a73fe0deaf3 100644
 -- 
 2.32.0
 
-From 81bf3ec4b78e7a521db63da29bd824fc57e6768f Mon Sep 17 00:00:00 2001
+From 99a19092cfd53f582701d10b32ec98747581be23 Mon Sep 17 00:00:00 2001
 From: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
-Date: Thu, 17 Jun 2021 17:00:40 +0530
+Date: Tue, 29 Jun 2021 14:18:03 +0530
 Subject: [PATCH] platform/x86: amd-pmc: Add new acpi id for future PMC
  controllers
 
@@ -949,13 +889,14 @@ The upcoming PMC controller would have a newer acpi id, add that to
 the supported acpid device list.
 
 Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
 Patchset: amd-s0ix
 ---
  drivers/platform/x86/amd-pmc.c | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index 2a73fe0deaf3..5a2be598fc2e 100644
+index b8740daecd7b..267173b142c1 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
 @@ -68,6 +68,7 @@
@@ -966,7 +907,7 @@ index 2a73fe0deaf3..5a2be598fc2e 100644
  
  #define PMC_MSG_DELAY_MIN_US		100
  #define RESPONSE_REGISTER_LOOP_MAX	200
-@@ -309,6 +310,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
+@@ -331,6 +332,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev)
  	case AMD_CPU_ID_PCO:
  		return MSG_OS_HINT_PCO;
  	case AMD_CPU_ID_RN:
@@ -974,7 +915,7 @@ index 2a73fe0deaf3..5a2be598fc2e 100644
  		return MSG_OS_HINT_RN;
  	}
  	return -EINVAL;
-@@ -354,6 +356,7 @@ static const struct dev_pm_ops amd_pmc_pm_ops = {
+@@ -376,6 +378,7 @@ static const struct dev_pm_ops amd_pmc_pm_ops = {
  };
  
  static const struct pci_device_id pmc_pci_ids[] = {
@@ -982,7 +923,7 @@ index 2a73fe0deaf3..5a2be598fc2e 100644
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_CZN) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RN) },
  	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_PCO) },
-@@ -444,6 +447,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
+@@ -470,6 +473,7 @@ static int amd_pmc_remove(struct platform_device *pdev)
  static const struct acpi_device_id amd_pmc_acpi_ids[] = {
  	{"AMDI0005", 0},
  	{"AMDI0006", 0},
@@ -993,33 +934,3 @@ index 2a73fe0deaf3..5a2be598fc2e 100644
 -- 
 2.32.0
 
-From 55daf6e146af2139e411d98474cfec9945374bbc Mon Sep 17 00:00:00 2001
-From: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
-Date: Thu, 17 Jun 2021 11:42:08 -0500
-Subject: [PATCH] ACPI: PM: s2idle: Use correct revision id
-
-AMD spec mentions only revision 0. With this change,
-device constraint list is populated properly.
-
-Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
-Patchset: amd-s0ix
----
- drivers/acpi/x86/s2idle.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
-index 482e6b23b21a..4339e6da0dd6 100644
---- a/drivers/acpi/x86/s2idle.c
-+++ b/drivers/acpi/x86/s2idle.c
-@@ -96,7 +96,7 @@ static void lpi_device_get_constraints_amd(void)
- 	int i, j, k;
- 
- 	out_obj = acpi_evaluate_dsm_typed(lps0_device_handle, &lps0_dsm_guid,
--					  1, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
-+					  rev_id, ACPI_LPS0_GET_DEVICE_CONSTRAINTS,
- 					  NULL, ACPI_TYPE_PACKAGE);
- 
- 	if (!out_obj)
--- 
-2.32.0
-

pkg/arch/kernel/PKGBUILD

@@ -48,17 +48,17 @@ sha256sums=('SKIP'
             'fcfb29005032125010bcf18ce2f177af7c84c74cff729de8f0cc3e4a552a59a4'
             '252c7a78ffb1efe9751aabc93cc79031ef69dbc95baa7970cbaabcd5474fe7d8'
             '9474de18769968c5558fedda5be354fe0babf1365541d4d0ac8e1ac47d4bbb88'
-            '406e656d2b1f2f568675af268c25f8f2c21cb58a82c6f42229a889ab85050f9b'
-            '4a4b0936e5989daa5f4ce9b555f380e7132623256dce3662f07e294f8c422f99'
-            '34f4b4005b39529484980a0df8f0c4eae5d32ea62203d2628d866fa1323ebb90'
-            '81e9a4de45527fc5fe861eec9718206c1a9b96b59e48997737358234013bca57'
-            'c3e67956ca004abf59dbb00bf295b0f9480b39e79da85b8a0abca9c001fec834'
-            'd64bde29a3c84b5d564e68e0f60dbe546bd2e092deb78de7ce1bcf9cecd69c1e'
-            '3513815382e525885fa9dbc253965d0251c64b5e69050b44aaae78d1038a95e1'
-            'a2f2ca93af8e18cb16ab4934d9be65bf3eb12654298a9403506ae44252c00aac'
-            '89e2dc21fc6095c139d1a5471188ff7f2ba26f3ac5cef8f7322bfa04ebff3618'
-            '66c9cb43c302222ba538684b41d4fe708b9e326bb61777362d4a1ee07f1460ca'
-            'a6cfa44ebfcdd8bfc02961324dcbb80b89f5adf4392415a68a7b3f5617a03484')
+            'e5e3fc31917209c1b75233bd9a169e58b5a25cea9d4a3c5cb8cb871dd78e526b'
+            '514ea7b5410e587eefdf626830e4408ab5b1b0745077c7820002f7fd5a03757a'
+            'bad9d34a211fa11508a7e1ccaa60ea788403604bf10008b82b92a05d9b3a393a'
+            '13cdd6e2f021d53113f9d3c6d785b3c8316278ed382f7f37e166f6cf52525a5b'
+            'e4934366d31e02892da305497b233d31b7c7cd725da843dd9183b6d6fd93e17c'
+            '799bd84cb541e0a772583169bb81b4ac6b1fe0fb8d93a1da6f7ce1ef87ed6621'
+            'fc7d51ec23a26d578be88c288b2c5b62073aa4c15c16c78c822c3951e5371edf'
+            'd361b8f805735bc9b1859c8b03a9fb7f6c42a6a642c8627e747d5d66e87691a6'
+            '9731201514ea4ff44c5218d3b62d993d6d5c9cebea7ca2eb2be806b8eb584136'
+            'af14192be2f158607b591f0094c8f49ab3cd26d03deeb1788ff5db7969575496'
+            'c94305faedc833ded332b7ffe2a0c5c2e076ee0dcae884cf7892719906350810')
 
 
 export KBUILD_BUILD_HOST=archlinux