[PATCH] nvme-pci: Add suspend quirk for HP mt645 thin client

[Alexandru Gagniuc]

The HP Elite mt645 thin client exhibits resume times of over one
minute when using the normal nvme resume path. BIOS has tried to work
around this by setting the "StorageD3Enable" ACPI property, but only
if it detected the "Linux-HPI-Hybrid-Graphics" _OSI() flag. This flag
does not exist, so the BIOS workaround can't work.

Instead, just set NVME_QUIRK_SIMPLE_SUSPEND when running on an mt645.
The DMI_PRODUCT_NAME cannot be used because this string can be changed
in the field. Match against DMI_BOARD_NAME, which should be immutable.

Cc: stable at vger.kernel.org
Signed-off-by: Alexandru Gagniuc <alexandru.gagniuc at hp.com>
---
 drivers/nvme/host/pci.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 492f319ebdf3..25b59f5ce874 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2897,6 +2897,15 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
 		if ((dmi_match(DMI_BOARD_VENDOR, "LENOVO")) &&
 		     dmi_match(DMI_BOARD_NAME, "LNVNB161216"))
 			return NVME_QUIRK_SIMPLE_SUSPEND;
+	} else if (dmi_match(DMI_SYS_VENDOR, "HP") &&
+		   (dmi_match(DMI_BOARD_NAME, "8B0F") ||
+		    dmi_match(DMI_BOARD_NAME, "8B59"))) {
+		/*
+		 * Force simple suspend to work around long resume latencies
+		 * (1 minute or longer).
+		 */
+		dev_info(&pdev->dev, "simple suspend quirk for HP mt645\n");
+		return NVME_QUIRK_SIMPLE_SUSPEND;
 	}
 
 	return 0;
-- 
2.39.1