Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3caf0e4 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

nvme-pci: use simple suspend when a HMB is enabled 



[ Upstream commit b97120b15ebd3de51325084136d3b9c3cce656d6 ]

While the NVMe specification allows the device to access the host memory
buffer in host DRAM from all power states, hosts will fail access to
DRAM during S3 and similar power states.

Fixes: d916b1be ("nvme-pci: use host managed power state for suspend")
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9777d12a

drivers/nvme/host/pci.c

+6 −0
Original line number Diff line number Diff line
@@ -2971,9 +2971,15 @@ static int nvme_suspend(struct device *dev) 
	 * the PCI bus layer to put it into D3 in order to take the PCIe link

	 * down, so as to allow the platform to achieve its minimum low-power

	 * state (which may not be possible if the link is up).

	 *

	 * If a host memory buffer is enabled, shut down the device as the NVMe

	 * specification allows the device to access the host memory buffer in

	 * host DRAM from all power states, but hosts will fail access to DRAM

	 * during S3.

	 */

	if (pm_suspend_via_firmware() || !ctrl->npss ||

	    !pcie_aspm_enabled(pdev) ||

	    ndev->nr_host_mem_descs ||

	    (ndev->ctrl.quirks & NVME_QUIRK_SIMPLE_SUSPEND))

		return nvme_disable_prepare_reset(ndev, true);