From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 15 Aug 2024 08:39:20 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.19.320~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88b84eceba9d99a5dfab286a6af4627c2919df31;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch
---

diff --git a/queue-5.4/nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch b/queue-5.4/nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch
new file mode 100644
index 00000000000..33f9716ff60
--- /dev/null
+++ b/queue-5.4/nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch
@@ -0,0 +1,39 @@
+From ab091ec536cb7b271983c0c063b17f62f3591583 Mon Sep 17 00:00:00 2001
+From: WangYuli <wangyuli@uniontech.com>
+Date: Mon, 15 Jul 2024 17:31:44 +0800
+Subject: nvme/pci: Add APST quirk for Lenovo N60z laptop
+
+From: WangYuli <wangyuli@uniontech.com>
+
+commit ab091ec536cb7b271983c0c063b17f62f3591583 upstream.
+
+There is a hardware power-saving problem with the Lenovo N60z
+board. When turn it on and leave it for 10 hours, there is a
+20% chance that a nvme disk will not wake up until reboot.
+
+Link: https://lore.kernel.org/all/2B5581C46AC6E335+9c7a81f1-05fb-4fd0-9fbb-108757c21628@uniontech.com
+Signed-off-by: hmy <huanglin@uniontech.com>
+Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
+Signed-off-by: WangYuli <wangyuli@uniontech.com>
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/nvme/host/pci.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -2822,6 +2822,13 @@ static unsigned long check_vendor_combin
+ 			return NVME_QUIRK_SIMPLE_SUSPEND;
+ 	}
+ 
++	/*
++	 * NVMe SSD drops off the PCIe bus after system idle
++	 * for 10 hours on a Lenovo N60z board.
++	 */
++	if (dmi_match(DMI_BOARD_NAME, "LXKT-ZXEG-N6"))
++		return NVME_QUIRK_NO_APST;
++
+ 	return 0;
+ }
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index e07bf2d2e02..72b4dd8d5eb 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -255,3 +255,4 @@ drm-i915-gem-fix-virtual-memory-mapping-boundaries-calculation.patch
 arm64-cpufeature-fix-the-visibility-of-compat-hwcaps.patch
 media-uvcvideo-use-entity-get_cur-in-uvc_ctrl_set.patch
 exec-fix-toctou-between-perm-check-and-set-uid-gid-usage.patch
+nvme-pci-add-apst-quirk-for-lenovo-n60z-laptop.patch