patch: revert duplicate s0ix patch from xanmod

3 files changed, 32 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 122335a85fa4..c5f53c867378 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,6 +21,7 @@ pkgbase = linux-xanmod-rog
 	source = https://github.com/xanmod/linux/releases/download/5.15.6-xanmod2/patch-5.15.6-xanmod2.xz
 	source = choose-gcc-optimization.sh
 	source = sphinx-workaround.patch
+	source = Revert-duplicate-S0ix-patch.patch
 	source = Linux-5.15.7.patch.xz
 	source = PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
 	source = iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
@@ -52,6 +53,7 @@ pkgbase = linux-xanmod-rog
 	sha256sums = 8055bcb3765ca7995477db3f5de71d3ce76a232885a8179ff37dda21e0e5a587
 	sha256sums = 5b8eddb90671f3e8469a023b7ed0d3c5a9521f662affa1d541063e273b64dba8
 	sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb
+	sha256sums = dbe7547f9b4716ca0909fb064d2ece5478906c85578eb7ee5418c175aa70651a
 	sha256sums = 9ccc8dbf9853a44e1da6e9487af9e0097e4d42b9998227f919257f991de385c5
 	sha256sums = 20c0926964a4286486c3ae1dd05014767f42388316a7d60b4f52639536fbd615
 	sha256sums = 6c48a3e96b49ddb6ece78f3abb1a8a889a77c097f93b14ab052f1e19eda05076
diff --git a/PKGBUILD b/PKGBUILD
index f21b3fdf458b..b53221c6ab3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -102,6 +102,9 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
         "choose-gcc-optimization.sh"
         "sphinx-workaround.patch"
 
+        # revert duplicate s0ix patch from xanmod so our later patch applies
+        "Revert-duplicate-S0ix-patch.patch"
+
         # apply incremental kernel updates ahead of official Xanmod release
         #"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.15.1.xz"
         #"https://cdn.kernel.org/pub/linux/kernel/v5.x/incr/patch-5.15.6-7.xz"
@@ -163,6 +166,7 @@ sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
             '8055bcb3765ca7995477db3f5de71d3ce76a232885a8179ff37dda21e0e5a587'
             '5b8eddb90671f3e8469a023b7ed0d3c5a9521f662affa1d541063e273b64dba8'
             '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb'
+            'dbe7547f9b4716ca0909fb064d2ece5478906c85578eb7ee5418c175aa70651a'
             '9ccc8dbf9853a44e1da6e9487af9e0097e4d42b9998227f919257f991de385c5'
             '20c0926964a4286486c3ae1dd05014767f42388316a7d60b4f52639536fbd615'
             '6c48a3e96b49ddb6ece78f3abb1a8a889a77c097f93b14ab052f1e19eda05076'
diff --git a/Revert-duplicate-S0ix-patch.patch b/Revert-duplicate-S0ix-patch.patch
new file mode 100644
index 000000000000..52031cf9611e
--- /dev/null
+++ b/Revert-duplicate-S0ix-patch.patch
@@ -0,0 +1,26 @@
+From b3863a9f2fc39a1dc23bf164ec3e92506afd4684 Mon Sep 17 00:00:00 2001
+From: Scott B <arglebargle@arglebargle.dev>
+Date: Wed, 8 Dec 2021 10:10:08 -0800
+Subject: [PATCH] Revert duplicate S0ix patch
+
+This reverts commit cb65ee0c7e5981c4eca2cb3c30b389d020c3afb6.
+---
+ drivers/platform/x86/amd-pmc.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 54b88bedecdf..fc95620101e8 100644
+--- a/drivers/platform/x86/amd-pmc.c
++++ b/drivers/platform/x86/amd-pmc.c
+@@ -70,7 +70,7 @@
+ #define AMD_CPU_ID_CZN			AMD_CPU_ID_RN
+ #define AMD_CPU_ID_YC			0x14B5
+ 
+-#define PMC_MSG_DELAY_MIN_US		50
++#define PMC_MSG_DELAY_MIN_US		100
+ #define RESPONSE_REGISTER_LOOP_MAX	20000
+ 
+ #define SOC_SUBSYSTEM_IP_MAX	12
+-- 
+2.34.1
+