update s0ix patch

4 files changed, 246 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daa9400939aa..8cf0b339013c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -50,7 +50,7 @@ pkgbase = linux-xanmod-rog
 	source = Bluetooth-btusb-Add-support-for-IMC-Networks-Mediatek-Chip.patch
 	source = Bluetooth-btusb-Add-support-for-Foxconn-Mediatek-Chip.patch
 	source = Bluetooth-btusb-Add-support-for-IMC-Networks-Mediatek-Chip-MT7921.patch
-	source = 9001-v5.14.9-s0ix-patch-2021-10-01.patch
+	source = 9001-v5.14.10-s0ix-patch-2021-10-07.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = 7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2
@@ -87,7 +87,7 @@ pkgbase = linux-xanmod-rog
 	sha256sums = 292a7e32b248c7eee6e2f5407d609d03d985f367d329adb02b9d6dba1f85b44c
 	sha256sums = 7dbfdd120bc155cad1879579cb9dd1185eb5e37078c8c93fef604a275a163812
 	sha256sums = 1444af2e125080934c67b6adb4561fd354a72ce47d3de393b24f53832ee492ac
-	sha256sums = 5ceec5471d28c83f07abbc9b88dbc9651fc78df43765cc5dbc99045d58c90372
+	sha256sums = 4791bd109d70c84ab3835ee3bb1b8293fb9063553418e5fd341ed87244aad140
 
 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.9-s0ix-patch-2021-10-01.patch b/9001-v5.14.10-s0ix-patch-2021-10-07.patch
index 0cdc074a1309..74dd96fb12ea 100644
--- a/9001-v5.14.9-s0ix-patch-2021-10-01.patch
+++ b/9001-v5.14.10-s0ix-patch-2021-10-07.patch
@@ -1,11 +1,56 @@
-From 20f320ede46f498a93c0cfbc7b62a006b27006bb Mon Sep 17 00:00:00 2001
+From 3f318570b30ef7a34babda28ddc96cc7359822f6 Mon Sep 17 00:00:00 2001
 From: Scott B <arglebargle@arglebargle.dev>
-Date: Fri, 1 Oct 2021 12:33:36 -0700
-Subject: [PATCH] v5.14.9 s0ix patch 2021-10-01
+Date: Thu, 7 Oct 2021 14:34:30 -0700
+Subject: [PATCH] v5.14.10 s0ix patch 2021-10-07
 
 Squashed commit of the following:
 
-commit 56bfc72744803a7f82d88f8c19c40f2e93cde3ad
+commit 27bb867625743d06b875d4c7c501b4003f7fe1a8
+Author: Sanket Goswami <Sanket.Goswami@amd.com>
+Date:   Tue Oct 5 21:26:41 2021 +0530
+
+    platform/x86: amd-pmc: Add support for AMD Smart Trace Buffer
+
+    STB (Smart Trace Buffer), is a debug trace buffer which is used to help
+    isolate failures by analyzing the last feature that a system was running
+    before hitting a failure. This nonintrusive way is always running in the
+    background and trace is stored into the SoC.
+
+    This patch provides mechanism to access the STB buffer using the read and
+    write routines.
+
+    Co-developed-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+    Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
+    Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
+    Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 00c61ca3ae04a7d89494e3299af8d8cf647ca318
+Author: Sachi King <nakato@nakato.io>
+Date:   Sat Oct 2 14:18:40 2021 +1000
+
+    ACPI: PM: Include alternate AMDI0005 id in special behaviour
+
+    The Surface Laptop 4 AMD has used the AMD0005 to identify this
+    controller instead of using the appropriate ACPI ID AMDI0005.  The
+    AMD0005 needs the same special casing as AMDI0005.
+
+    Cc: <stable@vger.kernel.org> # 5.14+
+    Signed-off-by: Sachi King <nakato@nakato.io>
+
+commit 605d74009fd05ab904bf55f231c6866a045f3f1f
+Author: Sachi King <nakato@nakato.io>
+Date:   Sat Oct 2 14:18:39 2021 +1000
+
+    platform/x86: amd-pmc: Add alternative acpi id for PMC controller
+
+    The Surface Laptop 4 AMD has used the AMD0005 to identify this
+    controller instead of using the appropriate ACPI ID AMDI0005.  Include
+    AMD0005 in the acpi id list.
+
+    Cc: <stable@vger.kernel.org> # 5.14+
+    Signed-off-by: Sachi King <nakato@nakato.io>
+
+commit 78ec75c50b631738e18a4314b59d4555b2ef5af1
 Author: Lijo Lazar <lijo.lazar@amd.com>
 Date:   Fri Oct 1 18:16:25 2021 +0800
 
@@ -23,7 +68,7 @@ Date:   Fri Oct 1 18:16:25 2021 +0800
     Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
     Reviewed-by: Mario Limonciello <mario.limonciell@amd.com>
 
-commit 8465b898b1c71c6b308746af52b13d49ee37d668
+commit 5364cc5a36ea3c4931c9af16a34f7bc76e137fb8
 Author: Hans de Goede <hdegoede@redhat.com>
 Date:   Tue Sep 28 16:21:22 2021 +0200
 
@@ -42,7 +87,7 @@ Date:   Tue Sep 28 16:21:22 2021 +0200
     Reported-by: Nathan Chancellor <nathan@kernel.org>
     Signed-off-by: Hans de Goede <hdegoede@redhat.com>
 
-commit 754e8ad1275241ff650df196f6135bee72d9dc0d
+commit 19828e04572e6367dfedc04946611a82248a937b
 Author: Sanket Goswami <Sanket.Goswami@amd.com>
 Date:   Tue Sep 21 17:30:20 2021 +0530
 
@@ -54,7 +99,7 @@ Date:   Tue Sep 21 17:30:20 2021 +0530
     Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
     Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
 
-commit 460a4441aebbca88a4c58811950d725acd39f786
+commit 81b173859054b38b677d884ac3da2f5aa6edfd82
 Author: Sanket Goswami <Sanket.Goswami@amd.com>
 Date:   Tue Sep 21 17:29:10 2021 +0530
 
@@ -69,7 +114,7 @@ Date:   Tue Sep 21 17:29:10 2021 +0530
     Signed-off-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
     Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
 
-commit 495fbce51edc0e067c0d93e39e44e8116e88d767
+commit f9b9b877b5eaf324ed5ce3b071fa558228dc1ac9
 Author: Sanket Goswami <Sanket.Goswami@amd.com>
 Date:   Thu Sep 16 18:11:30 2021 +0530
 
@@ -82,7 +127,7 @@ Date:   Thu Sep 16 18:11:30 2021 +0530
     Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>
     Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
 
-commit fe1f3e1032a61e722f326c196abd9448035e7077
+commit fc6d78a0cb2a3075ffa503cf6b3334381e21d522
 Author: Sanket Goswami <Sanket.Goswami@amd.com>
 Date:   Thu Sep 16 18:10:02 2021 +0530
 
@@ -101,7 +146,7 @@ Date:   Thu Sep 16 18:10:02 2021 +0530
     Acked-by: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
     Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
 
-commit 3502100b6e5c119aef49660b4d9e3d58a7f97224
+commit df32112b47ab7ac5540c3471f4693543005d02e7
 Author: Mario Limonciello <mario.limonciello@amd.com>
 Date:   Wed Sep 15 16:52:16 2021 -0500
 
@@ -116,7 +161,7 @@ Date:   Wed Sep 15 16:52:16 2021 -0500
     BugLink: https://gitlab.freedesktop.org/drm/amd/-/issues/1708
     Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
 
-commit edf93040393f366b1592479d1e1dc661303d1aa3
+commit 16414f40c5fec817016450540ad72ab78c2f2005
 Author: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date:   Tue Aug 31 17:36:12 2021 +0530
 
@@ -129,7 +174,7 @@ Date:   Tue Aug 31 17:36:12 2021 +0530
 
     Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 
-commit b7b15bacfddd91f25205828322a3ef53c60ea261
+commit 4b1d3bc7c180512a8c76240591e0883d91149ba7
 Author: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 Date:   Tue Aug 31 17:36:13 2021 +0530
 
@@ -142,12 +187,13 @@ Date:   Tue Aug 31 17:36:13 2021 +0530
 
     Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
 ---
- drivers/acpi/processor_idle.c           |  3 +-
- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 +++-
- drivers/pinctrl/pinctrl-amd.c           | 19 ++++--
- drivers/pinctrl/pinctrl-amd.h           |  1 +
- drivers/platform/x86/amd-pmc.c          | 89 +++++++++++++++++++++++--
- 5 files changed, 113 insertions(+), 13 deletions(-)
+ drivers/acpi/processor_idle.c           |   3 +-
+ drivers/acpi/x86/s2idle.c               |   3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c |  14 +-
+ drivers/pinctrl/pinctrl-amd.c           |  19 ++-
+ drivers/pinctrl/pinctrl-amd.h           |   1 +
+ drivers/platform/x86/amd-pmc.c          | 200 +++++++++++++++++++++++-
+ 6 files changed, 226 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
 index 095c8aca141e..1b6529396371 100644
@@ -163,6 +209,27 @@ index 095c8aca141e..1b6529396371 100644
  			state->enter_dead = acpi_idle_play_dead;
  			drv->safe_state_index = count;
  		}
+diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
+index bd92b549fd5a..1c48358b43ba 100644
+--- a/drivers/acpi/x86/s2idle.c
++++ b/drivers/acpi/x86/s2idle.c
+@@ -371,7 +371,7 @@ static int lps0_device_attach(struct acpi_device *adev,
+ 		return 0;
+ 
+ 	if (acpi_s2idle_vendor_amd()) {
+-		/* AMD0004, AMDI0005:
++		/* AMD0004, AMD0005, AMDI0005:
+ 		 * - Should use rev_id 0x0
+ 		 * - function mask > 0x3: Should use AMD method, but has off by one bug
+ 		 * - function mask = 0x3: Should use Microsoft method
+@@ -390,6 +390,7 @@ static int lps0_device_attach(struct acpi_device *adev,
+ 					ACPI_LPS0_DSM_UUID_MICROSOFT, 0,
+ 					&lps0_dsm_guid_microsoft);
+ 		if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") ||
++						 !strcmp(hid, "AMD0005") ||
+ 						 !strcmp(hid, "AMDI0005"))) {
+ 			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;
+ 			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",
 diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
 index b4ced45301be..1795d448c700 100644
 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -273,10 +340,10 @@ index 95e763424042..1d4317073654 100644
  
  /*  KERNCZ configuration*/
 diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
-index d6a7c896ac86..548432a2ea65 100644
+index d6a7c896ac86..dc851c2c4d1c 100644
 --- a/drivers/platform/x86/amd-pmc.c
 +++ b/drivers/platform/x86/amd-pmc.c
-@@ -29,6 +29,10 @@
+@@ -29,6 +29,16 @@
  #define AMD_PMC_REGISTER_RESPONSE	0x980
  #define AMD_PMC_REGISTER_ARGUMENT	0x9BC
  
@@ -284,10 +351,24 @@ index d6a7c896ac86..548432a2ea65 100644
 +#define AMD_PMC_SCRATCH_REG_CZN		0x94
 +#define AMD_PMC_SCRATCH_REG_YC		0xD14
 +
++/* STB Registers */
++#define AMD_PMC_STB_INDEX_ADDRESS	0xF8
++#define AMD_PMC_STB_INDEX_DATA		0xFC
++#define AMD_PMC_STB_PMI_0		0x03E30600
++#define AMD_PMC_STB_PREDEF		0xC6000001
++
  /* Base address of SMU for mapping physical address to virtual address */
  #define AMD_PMC_SMU_INDEX_ADDRESS	0xB8
  #define AMD_PMC_SMU_INDEX_DATA		0xBC
-@@ -110,6 +114,10 @@ struct amd_pmc_dev {
+@@ -76,6 +86,7 @@
+ #define SOC_SUBSYSTEM_IP_MAX	12
+ #define DELAY_MIN_US		2000
+ #define DELAY_MAX_US		3000
++#define FIFO_SIZE		4096
+ enum amd_pmc_def {
+ 	MSG_TEST = 0x01,
+ 	MSG_OS_HINT_PCO,
+@@ -110,14 +121,26 @@ struct amd_pmc_dev {
  	u32 base_addr;
  	u32 cpu_id;
  	u32 active_ips;
@@ -296,9 +377,25 @@ index d6a7c896ac86..548432a2ea65 100644
 +	u16 minor;
 +	u16 rev;
  	struct device *dev;
++	struct pci_dev *rdev;
  	struct mutex lock; /* generic mutex lock */
  #if IS_ENABLED(CONFIG_DEBUG_FS)
-@@ -133,7 +141,7 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
+ 	struct dentry *dbgfs_dir;
+ #endif /* CONFIG_DEBUG_FS */
+ };
+ 
++static u32 stb_data[FIFO_SIZE];
++static bool enable_stb;
++module_param(enable_stb, bool, 0644);
++MODULE_PARM_DESC(enable_stb, "Enable the STB debug mechanism");
++
+ static struct amd_pmc_dev pmc;
++static int amd_pmc_write_stb(struct amd_pmc_dev *dev, u32 data);
++static int amd_pmc_read_stb(struct amd_pmc_dev *dev);
+ static int amd_pmc_send_cmd(struct amd_pmc_dev *dev, bool set, u32 *data, u8 msg, bool ret);
+ 
+ static inline u32 amd_pmc_reg_read(struct amd_pmc_dev *dev, int reg_offset)
+@@ -133,7 +156,7 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3
  struct smu_metrics {
  	u32 table_version;
  	u32 hint_count;
@@ -307,7 +404,7 @@ index d6a7c896ac86..548432a2ea65 100644
  	u32 timein_s0i2;
  	u64 timeentering_s0i3_lastcapture;
  	u64 timeentering_s0i3_totaltime;
-@@ -147,6 +155,49 @@ struct smu_metrics {
+@@ -147,6 +170,49 @@ struct smu_metrics {
  	u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX];
  } __packed;
  
@@ -357,7 +454,7 @@ index d6a7c896ac86..548432a2ea65 100644
  #ifdef CONFIG_DEBUG_FS
  static int smu_fw_info_show(struct seq_file *s, void *unused)
  {
-@@ -162,9 +213,12 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
+@@ -162,9 +228,12 @@ static int smu_fw_info_show(struct seq_file *s, void *unused)
  	seq_puts(s, "\n=== SMU Statistics ===\n");
  	seq_printf(s, "Table Version: %d\n", table.table_version);
  	seq_printf(s, "Hint Count: %d\n", table.hint_count);
@@ -371,7 +468,7 @@ index d6a7c896ac86..548432a2ea65 100644
  
  	seq_puts(s, "\n=== Active time (in us) ===\n");
  	for (idx = 0 ; idx < SOC_SUBSYSTEM_IP_MAX ; idx++) {
-@@ -201,6 +255,23 @@ static int s0ix_stats_show(struct seq_file *s, void *unused)
+@@ -201,6 +270,37 @@ static int s0ix_stats_show(struct seq_file *s, void *unused)
  }
  DEFINE_SHOW_ATTRIBUTE(s0ix_stats);
  
@@ -392,19 +489,37 @@ index d6a7c896ac86..548432a2ea65 100644
 +}
 +DEFINE_SHOW_ATTRIBUTE(amd_pmc_idlemask);
 +
++static int stb_read_show(struct seq_file *seq, void *unused)
++{
++	struct amd_pmc_dev *pdev = seq->private;
++	int i;
++
++	amd_pmc_read_stb(pdev);
++
++	for (i = 0; i < FIFO_SIZE; i += 4)
++		seq_hex_dump(seq, "", DUMP_PREFIX_NONE, 16, 1, &stb_data[i], 16, true);
++
++	return 0;
++}
++DEFINE_SHOW_ATTRIBUTE(stb_read);
++
  static void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
  {
  	debugfs_remove_recursive(dev->dbgfs_dir);
-@@ -213,6 +284,8 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
+@@ -213,6 +313,12 @@ static void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
  			    &smu_fw_info_fops);
  	debugfs_create_file("s0ix_stats", 0644, dev->dbgfs_dir, dev,
  			    &s0ix_stats_fops);
 +	debugfs_create_file("amd_pmc_idlemask", 0644, dev->dbgfs_dir, dev,
 +			    &amd_pmc_idlemask_fops);
++	/* Enable STB only when the module_param is set */
++	if (enable_stb)
++		debugfs_create_file("stb_read", 0644, dev->dbgfs_dir, dev,
++				    &stb_read_fops);
  }
  #else
  static inline void amd_pmc_dbgfs_register(struct amd_pmc_dev *dev)
-@@ -349,6 +422,8 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
+@@ -349,11 +455,16 @@ static int __maybe_unused amd_pmc_suspend(struct device *dev)
  	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_RESET, 0);
  	amd_pmc_send_cmd(pdev, 0, NULL, SMU_MSG_LOG_START, 0);
  
@@ -413,7 +528,15 @@ index d6a7c896ac86..548432a2ea65 100644
  	msg = amd_pmc_get_os_hint(pdev);
  	rc = amd_pmc_send_cmd(pdev, 1, NULL, msg, 0);
  	if (rc)
-@@ -363,14 +438,17 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
+ 		dev_err(pdev->dev, "suspend failed\n");
+ 
++	if (enable_stb)
++		amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF);
++
+ 	return rc;
+ }
+ 
+@@ -363,14 +474,21 @@ static int __maybe_unused amd_pmc_resume(struct device *dev)
  	int rc;
  	u8 msg;
  
@@ -431,10 +554,91 @@ index d6a7c896ac86..548432a2ea65 100644
 +	/* Dump the IdleMask to see the blockers */
 +	amd_pmc_idlemask_read(pdev, dev, NULL);
 +
++	/* Write data incremented by 1 to distinguish in stb_read */
++	if (enable_stb)
++		amd_pmc_write_stb(pdev, AMD_PMC_STB_PREDEF + 1);
++
  	return 0;
  }
  
-@@ -457,6 +535,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
+@@ -387,6 +505,76 @@ static const struct pci_device_id pmc_pci_ids[] = {
+ 	{ }
+ };
+ 
++static int amd_pmc_get_root_port(struct amd_pmc_dev *dev)
++{
++	dev->rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));
++	if (!dev->rdev || !pci_match_id(pmc_pci_ids, dev->rdev)) {
++		pci_dev_put(dev->rdev);
++		return -ENODEV;
++	}
++
++	return 0;
++}
++
++static int amd_pmc_write_stb(struct amd_pmc_dev *dev, u32 data)
++{
++	int rc;
++
++	rc = amd_pmc_get_root_port(dev);
++	if (rc)
++		return rc;
++
++	rc = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_ADDRESS, AMD_PMC_STB_PMI_0);
++	if (rc) {
++		dev_err(dev->dev, "failed to write addr in stb: 0x%X\n",
++			AMD_PMC_STB_INDEX_ADDRESS);
++		pci_dev_put(dev->rdev);
++		return pcibios_err_to_errno(rc);
++	}
++
++	rc = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_DATA, data);
++	if (rc) {
++		dev_err(dev->dev, "failed to write data in stb: 0x%X\n",
++			AMD_PMC_STB_INDEX_DATA);
++		pci_dev_put(dev->rdev);
++		return pcibios_err_to_errno(rc);
++	}
++
++	return 0;
++}
++
++static int amd_pmc_read_stb(struct amd_pmc_dev *dev)
++{
++	u32 cnt = 0, value;
++	int i, err;
++
++	err = amd_pmc_get_root_port(dev);
++	if (err)
++		return err;
++
++	err = pci_write_config_dword(dev->rdev, AMD_PMC_STB_INDEX_ADDRESS, AMD_PMC_STB_PMI_0);
++	if (err) {
++		dev_err(dev->dev, "error writing addr to stb: 0x%X\n",
++			AMD_PMC_STB_INDEX_ADDRESS);
++		pci_dev_put(dev->rdev);
++		return pcibios_err_to_errno(err);
++	}
++
++	for (i = 0; i < FIFO_SIZE; i++) {
++		err = pci_read_config_dword(dev->rdev, AMD_PMC_STB_INDEX_DATA, &value);
++		if (err) {
++			dev_err(dev->dev, "error reading data from stb: 0x%X\n",
++				AMD_PMC_STB_INDEX_DATA);
++			pci_dev_put(dev->rdev);
++			return pcibios_err_to_errno(err);
++		}
++
++		stb_data[cnt++] = value;
++	}
++
++	return 0;
++}
++
+ static int amd_pmc_probe(struct platform_device *pdev)
+ {
+ 	struct amd_pmc_dev *dev = &pmc;
+@@ -457,6 +645,7 @@ static int amd_pmc_probe(struct platform_device *pdev)
  	if (err)
  		dev_err(dev->dev, "SMU debugging info not supported on this platform\n");
  
@@ -442,6 +646,14 @@ index d6a7c896ac86..548432a2ea65 100644
  	platform_set_drvdata(pdev, dev);
  	amd_pmc_dbgfs_register(dev);
  	return 0;
+@@ -476,6 +665,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = {
+ 	{"AMDI0006", 0},
+ 	{"AMDI0007", 0},
+ 	{"AMD0004", 0},
++	{"AMD0005", 0},
+ 	{ }
+ };
+ MODULE_DEVICE_TABLE(acpi, amd_pmc_acpi_ids);
 -- 
 2.33.0
 
diff --git a/PKGBUILD b/PKGBUILD
index a549dabeb38c..3dc8726a0dec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -153,7 +153,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
         "Bluetooth-btusb-Add-support-for-IMC-Networks-Mediatek-Chip-MT7921.patch"
 
         # squashed s0ix enablement
-        "9001-v5.14.9-s0ix-patch-2021-10-01.patch"
+        "9001-v5.14.10-s0ix-patch-2021-10-07.patch"
         )
 validpgpkeys=(
     'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linux Torvalds
@@ -194,7 +194,7 @@ sha256sums=('7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2'
             '292a7e32b248c7eee6e2f5407d609d03d985f367d329adb02b9d6dba1f85b44c'
             '7dbfdd120bc155cad1879579cb9dd1185eb5e37078c8c93fef604a275a163812'
             '1444af2e125080934c67b6adb4561fd354a72ce47d3de393b24f53832ee492ac'
-            '5ceec5471d28c83f07abbc9b88dbc9651fc78df43765cc5dbc99045d58c90372')
+            '4791bd109d70c84ab3835ee3bb1b8293fb9063553418e5fd341ed87244aad140')
 
 # apply UKSM patch; TODO: note to self: don't forget to update the sum here during major version changes
 #
diff --git a/myconfig b/myconfig
index b9ee738e0f6f..cf683ec5893c 100644
--- a/myconfig
+++ b/myconfig
@@ -16,7 +16,7 @@ scripts/config --enable CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
 
 ## s0ix debugging
 scripts/config --enable CONFIG_CMDLINE_BOOL \
-               --set-str CONFIG_CMDLINE "pm_debug_messages amd_pmc.dyndbg=+p acpi.dyndbg=file drivers/acpi/x86/s2idle.c +p" \
+               --set-str CONFIG_CMDLINE "pm_debug_messages amd_pmc.dyndbg=+p acpi.dyndbg=file drivers/acpi/x86/s2idle.c +p amd_pmc.enable_stb=1" \
                --disable CMDLINE_OVERRIDE
 
 ## asusctl/supergfxctl compatibility