@@ -3238,6 +3238,7 @@ static int nvme_suspend(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct nvme_dev *ndev = pci_get_drvdata(pdev);
+ struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
struct nvme_ctrl *ctrl = &ndev->ctrl;
int ret = -EBUSY;
@@ -3257,7 +3258,7 @@ static int nvme_suspend(struct device *dev)
* state (which may not be possible if the link is up).
*/
if (pm_suspend_via_firmware() || !ctrl->npss ||
- !pcie_aspm_enabled(pdev) ||
+ !pcie_aspm_enabled(pdev) || bridge->suspend_poweroff ||
(ndev->ctrl.quirks & NVME_QUIRK_SIMPLE_SUSPEND))
return nvme_disable_prepare_reset(ndev, true);