From ff602b5c2f4b91d58b92ca79ffd6925a0f37cad4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 8 Sep 2024 13:26:46 +0200 Subject: [PATCH] 6.1-stable patches added patches: nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch --- ...-add-sleep-quirk-for-samsung-990-evo.patch | 44 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-6.1/nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch diff --git a/queue-6.1/nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch b/queue-6.1/nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch new file mode 100644 index 00000000000..1c169e2b437 --- /dev/null +++ b/queue-6.1/nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch @@ -0,0 +1,44 @@ +From 61aa894e7a2fda4ee026523b01d07e83ce2abb72 Mon Sep 17 00:00:00 2001 +From: Georg Gottleuber +Date: Tue, 27 Aug 2024 12:41:33 +0200 +Subject: nvme-pci: Add sleep quirk for Samsung 990 Evo + +From: Georg Gottleuber + +commit 61aa894e7a2fda4ee026523b01d07e83ce2abb72 upstream. + +On some TUXEDO platforms, a Samsung 990 Evo NVMe leads to a high +power consumption in s2idle sleep (2-3 watts). + +This patch applies 'Force No Simple Suspend' quirk to achieve a +sleep with a lower power consumption, typically around 0.5 watts. + +Signed-off-by: Georg Gottleuber +Signed-off-by: Werner Sembach +Cc: +Signed-off-by: Keith Busch +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nvme/host/pci.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/drivers/nvme/host/pci.c ++++ b/drivers/nvme/host/pci.c +@@ -3107,6 +3107,17 @@ static unsigned long check_vendor_combin + dmi_match(DMI_BOARD_NAME, "NS5x_7xPU") || + dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1")) + return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND; ++ } else if (pdev->vendor == 0x144d && pdev->device == 0xa80d) { ++ /* ++ * Exclude Samsung 990 Evo from NVME_QUIRK_SIMPLE_SUSPEND ++ * because of high power consumption (> 2 Watt) in s2idle ++ * sleep. Only some boards with Intel CPU are affected. ++ */ ++ if (dmi_match(DMI_BOARD_NAME, "GMxPXxx") || ++ dmi_match(DMI_BOARD_NAME, "PH4PG31") || ++ dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1") || ++ dmi_match(DMI_BOARD_NAME, "PH6PG01_PH6PG71")) ++ return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND; + } + + /* diff --git a/queue-6.1/series b/queue-6.1/series index f919ab86137..25114e798fe 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -14,3 +14,4 @@ perf-x86-intel-limit-the-period-on-haswell.patch irqchip-gic-v2m-fix-refcount-leak-in-gicv2m_of_init.patch x86-kaslr-expose-and-use-the-end-of-the-physical-memory-address-space.patch rtmutex-drop-rt_mutex-wait_lock-before-scheduling.patch +nvme-pci-add-sleep-quirk-for-samsung-990-evo.patch -- 2.47.3