Skip to contentSkip to conversation

acpi: PM: Move check for _DSD StorageD3Enable property to acpi

PATCH Superseded Mario Limonciello 5 participants 9 messages Jun 4, 2021 – Jun 7, 2021

Subsystems (2)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/2 acpi: PM: Move check for _DSD StorageD3Enable property to acpi

Although first implemented for NVME, this check may be usable by other drivers as well. Microsoft's specification explicitly mentions that is may be usable by SATA and AHCI devices. Google also indicates that they have used this with SDHCI in a downstream kernel tree that a user can plug a storage device into.

---
 drivers/acpi/device_pm.c | 25 +++++++++++++++++++++++++
 drivers/nvme/host/pci.c  | 28 +---------------------------
 include/linux/acpi.h     |  5 +++++
 3 files changed, 31 insertions(+), 27 deletions(-)

Changes from v4->v5:
* Correct extra "Link:" word in commit message

drivers/acpi/device_pm.c +25 -0
index d260bc1f3e6e..1edb68d00b8e 100644
@@ -1340,4 +1340,29 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
 	return 1;
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
+
+/**
+ * acpi_storage_d3 - Check if a storage device should use D3.
+ * @dev: Device to check
+ *
+ * Returns %true if @dev should be put into D3 when the ->suspend method is
+ * called, else %false.  The name of this function is somewhat misleading
+ * as it has nothing to do with storage except for the name of the ACPI
+ * property.  On some platforms resume will not work if this hint is ignored.
+ *
+ */
+bool acpi_storage_d3(struct device *dev)
+{
+	struct acpi_device *adev = ACPI_COMPANION(dev);
+	u8 val;
+
+	if (!adev)
+		return false;
+	if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
+			&val))
+		return false;
+	return val == 1;
+}
+EXPORT_SYMBOL_GPL(acpi_storage_d3);
+
 #endif /* CONFIG_PM */
drivers/nvme/host/pci.c +1 -27
index 3aa7245a505f..8fbc4c87a0d8 100644
@@ -2828,32 +2828,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_ACPI
-static bool nvme_acpi_storage_d3(struct pci_dev *dev)
-{
-	struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
-	u8 val;
-
-	/*
-	 * Look for _DSD property specifying that the storage device on the port
-	 * must use D3 to support deep platform power savings during
-	 * suspend-to-idle.
-	 */
-
-	if (!adev)
-		return false;
-	if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
-			&val))
-		return false;
-	return val == 1;
-}
-#else
-static inline bool nvme_acpi_storage_d3(struct pci_dev *dev)
-{
-	return false;
-}
-#endif /* CONFIG_ACPI */
-
 static void nvme_async_probe(void *data, async_cookie_t cookie)
 {
 	struct nvme_dev *dev = data;
@@ -2903,7 +2877,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 	quirks |= check_vendor_combination_bug(pdev);
 
-	if (!noacpi && nvme_acpi_storage_d3(pdev)) {
+	if (!noacpi && acpi_storage_d3(&pdev->dev)) {
 		/*
 		 * Some systems use a bios work around to ask for D3 on
 		 * platforms that support kernel managed suspend.
include/linux/acpi.h +5 -0
index c60745f657e9..dd0dafd21e33 100644
@@ -1004,6 +1004,7 @@ int acpi_dev_resume(struct device *dev);
 int acpi_subsys_runtime_suspend(struct device *dev);
 int acpi_subsys_runtime_resume(struct device *dev);
 int acpi_dev_pm_attach(struct device *dev, bool power_on);
+bool acpi_storage_d3(struct device *dev);
 #else
 static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
 static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
@@ -1011,6 +1012,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
 {
 	return 0;
 }
+static inline bool acpi_storage_d3(struct device *dev)
+{
+	return false;
+}
 #endif
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v5 2/2 acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

AMD systems from Renoir and Lucienne require that the NVME controller is put into D3 over a Modern Standby / suspend-to-idle cycle. This is "typically" accomplished using the StorageD3Enable property in the _DSD, but this property was introduced after many of these systems launched and most OEM systems don't have it in their BIOS.

On AMD Renoir without these drives going into D3 over suspend-to-idle the resume will fail with the NVME controller being reset and a trace like this in the kernel logs:

```
[   83.556118] nvme nvme0: I/O 161 QID 2 timeout, aborting
[   83.556178] nvme nvme0: I/O 162 QID 2 timeout, aborting
[   83.556187] nvme nvme0: I/O 163 QID 2 timeout, aborting
[   83.556196] nvme nvme0: I/O 164 QID 2 timeout, aborting
[   95.332114] nvme nvme0: I/O 25 QID 0 timeout, reset controller
[   95.332843] nvme nvme0: Abort status: 0x371
[   95.332852] nvme nvme0: Abort status: 0x371
[   95.332856] nvme nvme0: Abort status: 0x371
[   95.332859] nvme nvme0: Abort status: 0x371
[   95.332909] PM: dpm_run_callback(): pci_pm_resume+0x0/0xe0 returns -16
[   95.332936] nvme 0000:03:00.0: PM: failed to resume async: error -16
```

The Microsoft documentation for StorageD3Enable mentioned that Windows has a hardcoded allowlist for D3 support, which was used for these platforms. Introduce quirks to hardcode them for Linux as well.

As this property is now "standardized", OEM systems using AMD Cezanne and newer APU's have adopted this property, and quirks like this should not be necessary.

---
 drivers/acpi/device_pm.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Changes from v4->v5:
* Add this patch back in as it's been made apparent that the system needs to be hardcoded for these.
Changes:
- Drop Cezanne - it's now covered by StorageD3Enable
- Rebase ontop of acpi_storage_d3 outside of NVME

drivers/acpi/device_pm.c +19 -0
index 1edb68d00b8e..8fd2a15bf478 100644
@@ -20,6 +20,10 @@
 #include <linux/pm_runtime.h>
 #include <linux/suspend.h>
 
+#ifdef CONFIG_X86
+#include <asm/cpu_device_id.h>
+#endif
+
 #include "internal.h"
 
 /**
@@ -1341,6 +1345,15 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
 
+
+#ifdef CONFIG_X86
+static const struct x86_cpu_id storage_d3_cpu_ids[] = {
+	X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),	/* Renoir */
+	X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL),	/* Lucienne */
+	{}
+};
+#endif
+
 /**
  * acpi_storage_d3 - Check if a storage device should use D3.
  * @dev: Device to check
@@ -1356,6 +1369,12 @@ bool acpi_storage_d3(struct device *dev)
 	struct acpi_device *adev = ACPI_COMPANION(dev);
 	u8 val;
 
+#ifdef CONFIG_X86
+	/* Devices requiring D3, but from before StorageD3Enable was "standardized" */
+	if (x86_match_cpu(storage_d3_cpu_ids))
+		return true;
+#endif
+
 	if (!adev)
 		return false;
 	if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

drivers/acpi/device_pm.c int acpi_dev_pm_attach(struct device *dev, bool power_on) · line 1356

Quoted 9 lines · Mario Limonciello
drivers/acpi/device_pm.c +9 -0
+
+#ifdef CONFIG_X86
+static const struct x86_cpu_id storage_d3_cpu_ids[] = {
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),  /* Renoir */
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /* Lucienne */
+       {}
+};
+#endif
+

Is this the same matching logic that Windows is using?

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme

#3 lore raw

Re: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

Quoted 15 lines · Raul Rangel

drivers/acpi/device_pm.c int acpi_dev_pm_attach(struct device *dev, bool power_on) · line 1356

Quoted 9 lines · Mario Limonciello
drivers/acpi/device_pm.c +9 -0
+
+#ifdef CONFIG_X86
+static const struct x86_cpu_id storage_d3_cpu_ids[] = {
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),  /* Renoir */
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /* Lucienne */
+       {}
+};
+#endif
+

Is this the same matching logic that Windows is using?

I don't have access to confirm their logic for it - but they do have an allowlist that was used for systems before StorageD3Enable was introduced as well as a registry key to override it in Windows.

In Linux we can do it a number of ways:

* Detect the CPU in RN/LCN platforms
- Like I did in this patch

* Detect some other PCI device only present in RN/LCN platforms and set this hint
- Like some earlier versions of this patch series from Prike did

* Introduce a tri-state module parameter like d3=auto,off,on
- Set up logic behind auto to use acpi_storage_d3 primarily and look
at a quirk list as a fallback if that was false.

* Add a compile time option to include these quirks in either acpi or nvme.ko only if a user selected them.

* Enumerate all the field systems SMBIOS we can find with these CPUs
- Expect this to be a large quirk list.

I don't have a strong opinion between those two first options, but suspect the 3rd through 5th aren't really acceptable or scalable.

I'm open to other suggestions but testers of the patches thus far have made it clear that /something/ needs to be done to avoid the problems on RN with Linux though.

#4 lore raw

RE: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

[AMD Public Use]

Quoted 33 lines

-----Original Message-----
From: Limonciello, Mario <[email protected]>
Sent: Friday, June 4, 2021 1:58 PM
To: Raul Rangel <[email protected]>
Cc: Keith Busch <[email protected]>; Jens Axboe <[email protected]>; Christoph Hellwig <[email protected]>; Sagi Grimberg <[email protected]>; Rafael J . Wysocki <[email protected]>; open list:NVM EXPRESS DRIVER <linux- [email protected]>; [email protected]; [email protected]; S-k, Shyam-sundar <Shyam-sundar.S- [email protected]>; Deucher, Alexander <[email protected]>; Liang, Prike <[email protected]>; Julian Sikorski <[email protected]>
Subject: Re: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

Quoted 7 lines · Raul Rangel

drivers/acpi/device_pm.c int acpi_dev_pm_attach(struct device *dev, bool power_on)

Quoted 4 lines · Mario Limonciello
drivers/acpi/device_pm.c +4 -0
+
+#ifdef CONFIG_X86
+static const struct x86_cpu_id storage_d3_cpu_ids[] = {
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),  /* Renoir

*/

Quoted 1 line
Quoted 1 line

+ X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /*

Lucienne */

Quoted 7 lines

drivers/acpi/device_pm.c int acpi_dev_pm_attach(struct device *dev, bool power_on) · line 1356

Quoted 4 lines
drivers/acpi/device_pm.c +4 -0
+       {}
+};
+#endif
+

Is this the same matching logic that Windows is using?

Quoted 3 lines

I don't have access to confirm their logic for it - but they do have an allowlist that was used for systems before StorageD3Enable was introduced as well as a registry key to override it in Windows.

My understanding from the windows team is that these AMD platforms use the allow list.

Alex

Quoted 26 lines

In Linux we can do it a number of ways:

* Detect the CPU in RN/LCN platforms
- Like I did in this patch

* Detect some other PCI device only present in RN/LCN platforms and set this hint
- Like some earlier versions of this patch series from Prike did

* Introduce a tri-state module parameter like d3=auto,off,on
- Set up logic behind auto to use acpi_storage_d3 primarily and look at a
quirk list as a fallback if that was false.

* Add a compile time option to include these quirks in either acpi or nvme.ko only if a user selected them.

* Enumerate all the field systems SMBIOS we can find with these CPUs
- Expect this to be a large quirk list.

I don't have a strong opinion between those two first options, but suspect the 3rd through 5th aren't really acceptable or scalable.

I'm open to other suggestions but testers of the patches thus far have made it clear that /something/ needs to be done to avoid the problems on RN with Linux though.

Tested-by on v5 2/2
#5 lore raw

Re: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

In reply to Mario Limonciello

Am 04.06.21 um 18:54 schrieb Mario Limonciello:

Quoted 43 lines

AMD systems from Renoir and Lucienne require that the NVME controller is put into D3 over a Modern Standby / suspend-to-idle cycle. This is "typically" accomplished using the StorageD3Enable property in the _DSD, but this property was introduced after many of these systems launched and most OEM systems don't have it in their BIOS.

On AMD Renoir without these drives going into D3 over suspend-to-idle the resume will fail with the NVME controller being reset and a trace like this in the kernel logs:

```
[   83.556118] nvme nvme0: I/O 161 QID 2 timeout, aborting
[   83.556178] nvme nvme0: I/O 162 QID 2 timeout, aborting
[   83.556187] nvme nvme0: I/O 163 QID 2 timeout, aborting
[   83.556196] nvme nvme0: I/O 164 QID 2 timeout, aborting
[   95.332114] nvme nvme0: I/O 25 QID 0 timeout, reset controller
[   95.332843] nvme nvme0: Abort status: 0x371
[   95.332852] nvme nvme0: Abort status: 0x371
[   95.332856] nvme nvme0: Abort status: 0x371
[   95.332859] nvme nvme0: Abort status: 0x371
[   95.332909] PM: dpm_run_callback(): pci_pm_resume+0x0/0xe0 returns -16
[   95.332936] nvme 0000:03:00.0: PM: failed to resume async: error -16
```

The Microsoft documentation for StorageD3Enable mentioned that Windows has a hardcoded allowlist for D3 support, which was used for these platforms. Introduce quirks to hardcode them for Linux as well.

As this property is now "standardized", OEM systems using AMD Cezanne and newer APU's have adopted this property, and quirks like this should not be necessary.

---
  drivers/acpi/device_pm.c | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
Quoted 6 lines

Changes from v4->v5:
* Add this patch back in as it's been made apparent that the system needs to be hardcoded for these.
Changes:
- Drop Cezanne - it's now covered by StorageD3Enable
- Rebase ontop of acpi_storage_d3 outside of NVME

#6 lore raw

Re: [PATCH v5 2/2] acpi: PM: Add quirks for AMD Renoir/Lucienne CPUs to force the D3 hint

In reply to Mario Limonciello
Quoted 56 lines · Mario Limonciello

AMD systems from Renoir and Lucienne require that the NVME controller is put into D3 over a Modern Standby / suspend-to-idle cycle. This is "typically" accomplished using the StorageD3Enable property in the _DSD, but this property was introduced after many of these systems launched and most OEM systems don't have it in their BIOS.

On AMD Renoir without these drives going into D3 over suspend-to-idle the resume will fail with the NVME controller being reset and a trace like this in the kernel logs:

```
[   83.556118] nvme nvme0: I/O 161 QID 2 timeout, aborting
[   83.556178] nvme nvme0: I/O 162 QID 2 timeout, aborting
[   83.556187] nvme nvme0: I/O 163 QID 2 timeout, aborting
[   83.556196] nvme nvme0: I/O 164 QID 2 timeout, aborting
[   95.332114] nvme nvme0: I/O 25 QID 0 timeout, reset controller
[   95.332843] nvme nvme0: Abort status: 0x371
[   95.332852] nvme nvme0: Abort status: 0x371
[   95.332856] nvme nvme0: Abort status: 0x371
[   95.332859] nvme nvme0: Abort status: 0x371
[   95.332909] PM: dpm_run_callback(): pci_pm_resume+0x0/0xe0 returns -16
[   95.332936] nvme 0000:03:00.0: PM: failed to resume async: error -16
```

The Microsoft documentation for StorageD3Enable mentioned that Windows has a hardcoded allowlist for D3 support, which was used for these platforms. Introduce quirks to hardcode them for Linux as well.

As this property is now "standardized", OEM systems using AMD Cezanne and newer APU's have adopted this property, and quirks like this should not be necessary.

---
 drivers/acpi/device_pm.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

Changes from v4->v5:
* Add this patch back in as it's been made apparent that the system needs to be hardcoded for these.
Changes:
- Drop Cezanne - it's now covered by StorageD3Enable
- Rebase ontop of acpi_storage_d3 outside of NVME

drivers/acpi/device_pm.c +0 -0
index 1edb68d00b8e..8fd2a15bf478 100644

drivers/acpi/device_pm.c line 25

Quoted 6 lines
drivers/acpi/device_pm.c +3 -0
@@ -20,6 +20,10 @@
 #include <linux/pm_runtime.h>
 #include <linux/suspend.h>
 
+#ifdef CONFIG_X86
+#include <asm/cpu_device_id.h>
+#endif

This is a generic file, not x86 (or any other arch-specific) #ifdeffery in it, please.

There is the x86/ subdir under drivers/acpi/ for x86-specific stuff.

Quoted 36 lines
drivers/acpi/device_pm.c +16 -1
+
 #include "internal.h"
 
 /**
@@ -1341,6 +1345,15 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
 
+
+#ifdef CONFIG_X86
+static const struct x86_cpu_id storage_d3_cpu_ids[] = {
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 96, NULL),  /* Renoir */
+       X86_MATCH_VENDOR_FAM_MODEL(AMD, 23, 104, NULL), /* Lucienne */
+       {}
+};
+#endif
+
 /**
  * acpi_storage_d3 - Check if a storage device should use D3.
  * @dev: Device to check
@@ -1356,6 +1369,12 @@ bool acpi_storage_d3(struct device *dev)
        struct acpi_device *adev = ACPI_COMPANION(dev);
        u8 val;
 
+#ifdef CONFIG_X86
+       /* Devices requiring D3, but from before StorageD3Enable was "standardized" */
+       if (x86_match_cpu(storage_d3_cpu_ids))
+               return true;
+#endif
+
        if (!adev)
                return false;
        if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
--

2.25.1

Acked-by on v5 1/2
#7 lore raw
In reply to Mario Limonciello
Quoted 14 lines · Mario Limonciello

Although first implemented for NVME, this check may be usable by other drivers as well. Microsoft's specification explicitly mentions that is may be usable by SATA and AHCI devices. Google also indicates that they have used this with SDHCI in a downstream kernel tree that a user can plug a storage device into.

Quoted 9 lines
---
 drivers/acpi/device_pm.c | 25 +++++++++++++++++++++++++
 drivers/nvme/host/pci.c  | 28 +---------------------------
 include/linux/acpi.h     |  5 +++++
 3 files changed, 31 insertions(+), 27 deletions(-)

Changes from v4->v5:
* Correct extra "Link:" word in commit message

#8 lore raw
In reply to Mario Limonciello
Quoted 7 lines · Mario Limonciello

Although first implemented for NVME, this check may be usable by other drivers as well. Microsoft's specification explicitly mentions that is may be usable by SATA and AHCI devices. Google also indicates that they have used this with SDHCI in a downstream kernel tree that a user can plug a storage device into.

Quoted 7 lines

You've received some tags on the v4, can you please resend it with the tags added?

Quoted 115 lines
---
 drivers/acpi/device_pm.c | 25 +++++++++++++++++++++++++
 drivers/nvme/host/pci.c  | 28 +---------------------------
 include/linux/acpi.h     |  5 +++++
 3 files changed, 31 insertions(+), 27 deletions(-)

Changes from v4->v5:
* Correct extra "Link:" word in commit message

drivers/acpi/device_pm.c +25 -0
index d260bc1f3e6e..1edb68d00b8e 100644
@@ -1340,4 +1340,29 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
        return 1;
 }
 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
+
+/**
+ * acpi_storage_d3 - Check if a storage device should use D3.
+ * @dev: Device to check
+ *
+ * Returns %true if @dev should be put into D3 when the ->suspend method is
+ * called, else %false.  The name of this function is somewhat misleading
+ * as it has nothing to do with storage except for the name of the ACPI
+ * property.  On some platforms resume will not work if this hint is ignored.
+ *
+ */
+bool acpi_storage_d3(struct device *dev)
+{
+       struct acpi_device *adev = ACPI_COMPANION(dev);
+       u8 val;
+
+       if (!adev)
+               return false;
+       if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
+                       &val))
+               return false;
+       return val == 1;
+}
+EXPORT_SYMBOL_GPL(acpi_storage_d3);
+
 #endif /* CONFIG_PM */
drivers/nvme/host/pci.c +1 -27
index 3aa7245a505f..8fbc4c87a0d8 100644
@@ -2828,32 +2828,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev)
        return 0;
 }
 
-#ifdef CONFIG_ACPI
-static bool nvme_acpi_storage_d3(struct pci_dev *dev)
-{
-       struct acpi_device *adev = ACPI_COMPANION(&dev->dev);
-       u8 val;
-
-       /*
-        * Look for _DSD property specifying that the storage device on the port
-        * must use D3 to support deep platform power savings during
-        * suspend-to-idle.
-        */
-
-       if (!adev)
-               return false;
-       if (fwnode_property_read_u8(acpi_fwnode_handle(adev), "StorageD3Enable",
-                       &val))
-               return false;
-       return val == 1;
-}
-#else
-static inline bool nvme_acpi_storage_d3(struct pci_dev *dev)
-{
-       return false;
-}
-#endif /* CONFIG_ACPI */
-
 static void nvme_async_probe(void *data, async_cookie_t cookie)
 {
        struct nvme_dev *dev = data;
@@ -2903,7 +2877,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        quirks |= check_vendor_combination_bug(pdev);
 
-       if (!noacpi && nvme_acpi_storage_d3(pdev)) {
+       if (!noacpi && acpi_storage_d3(&pdev->dev)) {
                /*
                 * Some systems use a bios work around to ask for D3 on
                 * platforms that support kernel managed suspend.
include/linux/acpi.h +5 -1
index c60745f657e9..dd0dafd21e33 100644
@@ -1004,6 +1004,7 @@ int acpi_dev_resume(struct device *dev);
 int acpi_subsys_runtime_suspend(struct device *dev);
 int acpi_subsys_runtime_resume(struct device *dev);
 int acpi_dev_pm_attach(struct device *dev, bool power_on);
+bool acpi_storage_d3(struct device *dev);
 #else
 static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
 static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
@@ -1011,6 +1012,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on)
 {
        return 0;
 }
+static inline bool acpi_storage_d3(struct device *dev)
+{
+       return false;
+}
 #endif
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
--

2.25.1