From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 31 Oct 2023 11:12:19 +0000 (+0100)
Subject: 6.1-stable patches
X-Git-Tag: v6.1.61~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34f540205cc5aa8ae4d518fc39e1bff74c3ceb3f;p=thirdparty%2Fkernel%2Fstable-queue.git

6.1-stable patches

added patches:
	platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch
---

diff --git a/queue-6.1/platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch b/queue-6.1/platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch
new file mode 100644
index 00000000000..73fcb1adc73
--- /dev/null
+++ b/queue-6.1/platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch
@@ -0,0 +1,118 @@
+From 3bde7ec13c971445faade32172cb0b4370b841d9 Mon Sep 17 00:00:00 2001
+From: David Lazar <dlazar@gmail.com>
+Date: Wed, 25 Oct 2023 21:30:16 +0200
+Subject: platform/x86: Add s2idle quirk for more Lenovo laptops
+
+From: David Lazar <dlazar@gmail.com>
+
+commit 3bde7ec13c971445faade32172cb0b4370b841d9 upstream.
+
+When suspending to idle and resuming on some Lenovo laptops using the
+Mendocino APU, multiple NVME IOMMU page faults occur, showing up in
+dmesg as repeated errors:
+
+nvme 0000:01:00.0: AMD-Vi: Event logged [IO_PAGE_FAULT domain=0x000b
+address=0xb6674000 flags=0x0000]
+
+The system is unstable afterwards.
+
+Applying the s2idle quirk introduced by commit 455cd867b85b ("platform/x86:
+thinkpad_acpi: Add a s2idle resume quirk for a number of laptops")
+allows these systems to work with the IOMMU enabled and s2idle
+resume to work.
+
+Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218024
+Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
+Suggested-by: Mark Pearson <mpearson-lenovo@squebb.ca>
+Signed-off-by: David Lazar <dlazar@gmail.com>
+Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
+Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
+Link: https://lore.kernel.org/r/ZTlsyOaFucF2pWrL@localhost
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/platform/x86/thinkpad_acpi.c |   73 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 73 insertions(+)
+
+--- a/drivers/platform/x86/thinkpad_acpi.c
++++ b/drivers/platform/x86/thinkpad_acpi.c
+@@ -4513,6 +4513,79 @@ static const struct dmi_system_id fwbug_
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "21A1"),
+ 		}
+ 	},
++	/* https://bugzilla.kernel.org/show_bug.cgi?id=218024 */
++	{
++		.ident = "V14 G4 AMN",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82YT"),
++		}
++	},
++	{
++		.ident = "V14 G4 AMN",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "83GE"),
++		}
++	},
++	{
++		.ident = "V15 G4 AMN",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82YU"),
++		}
++	},
++	{
++		.ident = "V15 G4 AMN",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "83CQ"),
++		}
++	},
++	{
++		.ident = "IdeaPad 1 14AMN7",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82VF"),
++		}
++	},
++	{
++		.ident = "IdeaPad 1 15AMN7",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82VG"),
++		}
++	},
++	{
++		.ident = "IdeaPad 1 15AMN7",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82X5"),
++		}
++	},
++	{
++		.ident = "IdeaPad Slim 3 14AMN8",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82XN"),
++		}
++	},
++	{
++		.ident = "IdeaPad Slim 3 15AMN8",
++		.driver_data = &quirk_s2idle_bug,
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "82XQ"),
++		}
++	},
+ 	{}
+ };
+ 
diff --git a/queue-6.1/series b/queue-6.1/series
index 41be20bc6c3..9be14efbfd4 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -79,3 +79,4 @@ x86-cpu-add-model-number-for-intel-arrow-lake-mobile-processor.patch
 perf-core-fix-potential-null-deref.patch
 sparc32-fix-a-braino-in-fault-handling-in-csum_and_copy_..._user.patch
 clk-sanitize-possible_parent_show-to-handle-return-value-of-of_clk_get_parent_name.patch
+platform-x86-add-s2idle-quirk-for-more-lenovo-laptops.patch