From: Sasha Levin Date: Mon, 30 Oct 2023 23:14:24 +0000 (-0400) Subject: Fixes for 6.5 X-Git-Tag: v6.1.61~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00067d0461db77a91157aa139600c70d18c0fffd;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 6.5 Signed-off-by: Sasha Levin --- diff --git a/queue-6.5/platform-x86-add-s2idle-quirk-for-more-lenovo-laptop.patch b/queue-6.5/platform-x86-add-s2idle-quirk-for-more-lenovo-laptop.patch new file mode 100644 index 00000000000..9c590bbcfc8 --- /dev/null +++ b/queue-6.5/platform-x86-add-s2idle-quirk-for-more-lenovo-laptop.patch @@ -0,0 +1,123 @@ +From 7f2796a6e7709035d8349d7801d290a786db4fe2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 25 Oct 2023 21:30:16 +0200 +Subject: platform/x86: Add s2idle quirk for more Lenovo laptops + +From: David Lazar + +[ Upstream commit 3bde7ec13c971445faade32172cb0b4370b841d9 ] + +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 +Suggested-by: Mark Pearson +Signed-off-by: David Lazar +Reviewed-by: Mario Limonciello +Reviewed-by: Mark Pearson +Link: https://lore.kernel.org/r/ZTlsyOaFucF2pWrL@localhost +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + drivers/platform/x86/amd/pmc-quirks.c | 73 +++++++++++++++++++++++++++ + 1 file changed, 73 insertions(+) + +diff --git a/drivers/platform/x86/amd/pmc-quirks.c b/drivers/platform/x86/amd/pmc-quirks.c +index ad702463a65d3..6bbffb081053e 100644 +--- a/drivers/platform/x86/amd/pmc-quirks.c ++++ b/drivers/platform/x86/amd/pmc-quirks.c +@@ -111,6 +111,79 @@ static const struct dmi_system_id fwbug_list[] = { + 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"), ++ } ++ }, + /* https://gitlab.freedesktop.org/drm/amd/-/issues/2684 */ + { + .ident = "HP Laptop 15s-eq2xxx", +-- +2.42.0 + diff --git a/queue-6.5/series b/queue-6.5/series index c11abef1ffa..4abf3798c44 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -108,3 +108,4 @@ 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 clk-socfpga-gate-account-for-the-divider-in-determine_rate.patch clk-stm32-fix-a-signedness-issue-in-clk_stm32_composite_determine_rate.patch +platform-x86-add-s2idle-quirk-for-more-lenovo-laptop.patch