update s0ix support

Rolled all s0ix patches into the s0ix kernel tree, including our
SMU delay hack.

4 files changed, 62 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f219a8aab513..401961786469 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -42,8 +42,7 @@ pkgbase = linux-xanmod-rog
 	source = mt76-mt7921-fix-the-inconsistent-state-between-bind-and-unbind.patch
 	source = mt76-mt7921-report-HE-MU-radiotap.patch
 	source = v2-mt76-mt7921-fix-kernel-warning-from-cfg80211_calculate_bitrate.patch
-	source = 9001-v5.14.1-s0ix-patch-2021-09-03.patch
-	source = 9002-amd-pmc-delay-test.patch
+	source = 9001-v5.14.1-s0ix-patch-2021-09-07.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = 7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
@@ -72,8 +71,7 @@ pkgbase = linux-xanmod-rog
 	sha256sums = 5b7a106d371fcf880920967d7e36728f1bcc0368eaa7bf75ebf67a4ddb93c6d5
 	sha256sums = aa5bb422421cb7e1340d8f07b5471995bbc3c7dd7cf91db76ab1dbe7efc2777a
 	sha256sums = 5e66b5a6a775ad42489dfd0f6057b69dae696a5ec8be428da329f68c1265764a
-	sha256sums = 3d6d1e6374688c5f1abbc40b15c03c62f695e9d04d790556c57f8ec5d0d6a3f9
-	sha256sums = d8dd84c26a44af618c6d1b68723e3bf0f8f50165af04fe090256afb0f931713e
+	sha256sums = e04bbbdd23d702c95b67415a20a7a1bd3ba5c236a76b84a81f40101566aaeb19
 
 pkgname = linux-xanmod-rog
 	pkgdesc = The Linux kernel and modules with Xanmod and ASUS ROG laptop patches (Zephyrus G14, G15, etc)
diff --git a/9001-v5.14.1-s0ix-patch-2021-09-03.patch b/9001-v5.14.1-s0ix-patch-2021-09-07.patch
index 21d22c496a3a..b5954dd3ad2b 100644
--- a/9001-v5.14.1-s0ix-patch-2021-09-03.patch
+++ b/9001-v5.14.1-s0ix-patch-2021-09-07.patch
@@ -1,11 +1,32 @@
-From 20d622ad8d682cdfa8d2db3aac2e2940fb6b7f37 Mon Sep 17 00:00:00 2001
+From 138fca2964bb79b2de2762c811e1eca9d7960ce3 Mon Sep 17 00:00:00 2001
 From: Scott B <arglebargle@arglebargle.dev>
-Date: Fri, 3 Sep 2021 06:18:48 -0700
-Subject: [PATCH] v5.14.1 s0ix patch 2021-09-03
+Date: Tue, 7 Sep 2021 10:38:33 -0700
+Subject: [PATCH] v5.14.1 s0ix patch 2021-09-07
 
 Squashed commit of the following:
 
-commit 59a128d473a903fc256ca20b05a83aedae570fef
+commit 3bef8169a10e101d1fba8ac4d89f79093246c6cc
+Author: Scott B <28817345+foundObjects@users.noreply.github.com>
+Date:   Wed Aug 25 07:35:52 2021 -0700
+
+    HACK: amd-pmc delay hack
+
+    This patch adds some delays into the resume process to allow the SMU
+    enough time to wake before servicing resume events.
+
+    This is a dirty hack but it *completely* resolves the SMU state issues
+    we've had for months.
+
+commit 52d0bc60a6cc224c7a92b4d6ce45bae33cf7cc91
+Author: Scott B <28817345+foundObjects@users.noreply.github.com>
+Date:   Wed Jul 21 18:10:28 2021 -0700
+
+    DEBUG: amd-pmc smu register dump for diagnostics
+
+    patch this per Mario's request:
+    https://gitlab.freedesktop.org/drm/amd/-/issues/1629#note_1000332
+
+commit e6ac6794f048a9d9324f0deb412db6f3ed350918
 Author: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date:   Tue Aug 31 17:36:12 2021 +0530
 
@@ -18,7 +39,7 @@ Date:   Tue Aug 31 17:36:12 2021 +0530
 
     Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 
-commit d48c21c63803949bb4655e93b0fb064d56db5682
+commit e10817ed65b87598133c4fa763f1277bd1ccbfec
 Author: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date:   Tue Aug 31 17:36:13 2021 +0530
 
@@ -31,7 +52,7 @@ Date:   Tue Aug 31 17:36:13 2021 +0530
 
     Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 
-commit 2219e4d484f61a7234a1744fe7f44255850264fb
+commit 235811f2100ad24d7a847581a3dc9460f07c876c
 Author: Mario Limonciello <mario.limonciello@amd.com>
 Date:   Tue Aug 31 11:36:19 2021 -0500
 
@@ -60,15 +81,6 @@ Date:   Tue Aug 31 11:36:19 2021 -0500
     Reported-by: Maxwell Beck <max@ryt.one>
     Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
 
-commit 290e605b95a082a6cef455fcb89e263271db9ee5
-Author: Scott B <28817345+foundObjects@users.noreply.github.com>
-Date:   Wed Jul 21 18:10:28 2021 -0700
-
-    amd-pmc smu register dump for diagnostics
-
-    patch this per Mario's request:
-    https://gitlab.freedesktop.org/drm/amd/-/issues/1629#note_1000332
-
 commit 69a3e85d633dbdac57017feb9a059b97c8937034
 Author: Scott B <28817345+foundObjects@users.noreply.github.com>
 Date:   Tue Jul 20 23:33:01 2021 -0700
@@ -197,8 +209,8 @@ Date:   Fri Jul 9 23:33:11 2021 -0400
  drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h        |   3 +-
  drivers/pinctrl/pinctrl-amd.c                 |  19 +-
  drivers/pinctrl/pinctrl-amd.h                 |   1 +
- drivers/platform/x86/amd-pmc.c                |   1 +
- 8 files changed, 306 insertions(+), 81 deletions(-)
+ drivers/platform/x86/amd-pmc.c                |   9 +-
+ 8 files changed, 313 insertions(+), 82 deletions(-)
 
 diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
 index 3a308461246a..7d1976e5dd8b 100644
@@ -750,9 +762,18 @@ index 95e763424042..1d4317073654 100644
  
  /*  KERNCZ configuration*/
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index 3481479a2942..52a88c9bc0ab 100644
+index 3481479a2942..336303e963c5 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
+@@ -71,7 +71,7 @@
+ #define AMD_CPU_ID_YC			0x14B5
+ 
+ #define PMC_MSG_DELAY_MIN_US		100
+-#define RESPONSE_REGISTER_LOOP_MAX	200
++#define RESPONSE_REGISTER_LOOP_MAX     2000
+ 
+ #define SOC_SUBSYSTEM_IP_MAX	12
+ #define DELAY_MIN_US		2000
 @@ -270,6 +270,7 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg
  	u32 val;
  
@@ -761,6 +782,25 @@ index 3481479a2942..52a88c9bc0ab 100644
  	/* 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,
+@@ -282,12 +283,18 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg
+ 	/* Write zero to response register */
+ 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_RESPONSE, 0);
+ 
++	udelay(500);
++
+ 	/* Write argument into response register */
+ 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set);
+ 
++	udelay(500);
++
+ 	/* Write message ID to message ID register */
+ 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg);
+ 
++	udelay(500);
++
+ 	/* 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,
 -- 
 2.33.0
 
diff --git a/9002-amd-pmc-delay-test.patch b/9002-amd-pmc-delay-test.patch
deleted file mode 100644
index 5c1d59cc0ddf..000000000000
--- a/9002-amd-pmc-delay-test.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 47e5da763d58a3b6657e2a716130a470e1deee2f Mon Sep 17 00:00:00 2001
-From: Scott B <28817345+foundObjects@users.noreply.github.com>
-Date: Wed, 25 Aug 2021 07:35:52 -0700
-Subject: [PATCH] amd-pmc delay test
-
----
- drivers/platform/x86/amd-pmc.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index 52a88c9bc0ab..336303e963c5 100644
---- a/drivers/platform/x86/amd-pmc.c
-+++ b/drivers/platform/x86/amd-pmc.c
-@@ -71,7 +71,7 @@
- #define AMD_CPU_ID_YC			0x14B5
- 
- #define PMC_MSG_DELAY_MIN_US		100
--#define RESPONSE_REGISTER_LOOP_MAX	200
-+#define RESPONSE_REGISTER_LOOP_MAX     2000
- 
- #define SOC_SUBSYSTEM_IP_MAX	12
- #define DELAY_MIN_US		2000
-@@ -283,12 +283,18 @@ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg
- 	/* Write zero to response register */
- 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_RESPONSE, 0);
- 
-+	udelay(500);
-+
- 	/* Write argument into response register */
- 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_ARGUMENT, set);
- 
-+	udelay(500);
-+
- 	/* Write message ID to message ID register */
- 	amd_pmc_reg_write(dev, AMD_PMC_REGISTER_MESSAGE, msg);
- 
-+	udelay(500);
-+
- 	/* 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,
--- 
-2.33.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 37602a8ae1e7..03b2a37bd215 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -144,9 +144,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
         "v2-mt76-mt7921-fix-kernel-warning-from-cfg80211_calculate_bitrate.patch"
 
         # squashed s0ix enablement
-        "9001-v5.14.1-s0ix-patch-2021-09-03.patch"
-        # delay hack adding micro delays during resume, drastically improves SMU stability
-        "9002-amd-pmc-delay-test.patch"
+        "9001-v5.14.1-s0ix-patch-2021-09-07.patch"
         )
 validpgpkeys=(
     'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -179,8 +177,7 @@ sha256sums=('7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2'
             '5b7a106d371fcf880920967d7e36728f1bcc0368eaa7bf75ebf67a4ddb93c6d5'
             'aa5bb422421cb7e1340d8f07b5471995bbc3c7dd7cf91db76ab1dbe7efc2777a'
             '5e66b5a6a775ad42489dfd0f6057b69dae696a5ec8be428da329f68c1265764a'
-            '3d6d1e6374688c5f1abbc40b15c03c62f695e9d04d790556c57f8ec5d0d6a3f9'
-            'd8dd84c26a44af618c6d1b68723e3bf0f8f50165af04fe090256afb0f931713e')
+            'e04bbbdd23d702c95b67415a20a7a1bd3ba5c236a76b84a81f40101566aaeb19')
 
 # apply UKSM patch; TODO: note to self: don't forget to update the sum here during major version changes
 #