Commit 07855155 authored by Bart Van Assche's avatar Bart Van Assche Committed by ZhangPeng
Browse files

nvme-pci: Fix the instructions for disabling power management 

stable inclusion
from stable-v6.6.44
commit 8772be96705a9fdfb46d71b491d34c0ada7863f7
bugzilla: https://gitee.com/openeuler/kernel/issues/IAHMJO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8772be96705a9fdfb46d71b491d34c0ada7863f7



--------------------------------

[ Upstream commit 92fc2c469eb26060384e9b2cd4cb0cc228aba582 ]

pcie_aspm=off tells the kernel not to modify the ASPM configuration. This
setting does not guarantee that ASPM (Active State Power Management) is
disabled. Hence add pcie_port_pm=off. This disables power management for
all PCIe ports.

This patch has been tested on a workstation with a Samsung SSD 970 EVO Plus
NVMe SSD.

Fixes: 4641a8e6 ("nvme-pci: add trouble shooting steps for timeouts")
Cc: Keith Busch <kbusch@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent a9979e64

drivers/nvme/host/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ static void nvme_warn_reset(struct nvme_dev *dev, u32 csts) 
	dev_warn(dev->ctrl.device,

		 "Does your device have a faulty power saving mode enabled?\n");

	dev_warn(dev->ctrl.device,

		 "Try \"nvme_core.default_ps_max_latency_us=0 pcie_aspm=off\" and report a bug\n");

		 "Try \"nvme_core.default_ps_max_latency_us=0 pcie_aspm=off pcie_port_pm=off\" and report a bug\n");

}



static enum blk_eh_timer_return nvme_timeout(struct request *req)