Dell Inspiron 14 2-in-1 has two ACPI nodes under GPP1 both with _ADR of
0, both without _HID. It's ambiguous which the kernel should take, but
it seems to take "DEV0". Unfortunately "DEV0" is missing the device
property `StorageD3Enable` which is present on "NVME".
To avoid this causing problems for suspend, add a quirk for this system
to behave like `StorageD3Enable` property was found.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216440
Reported-and-tested-by: Luya Tshimbalanga <[email protected]>
Signed-off-by: Mario Limonciello <[email protected]>
---
I had attempted to modify the heuristics for when two ACPI devices
have the same _ADR to prefer the one with a _DSD, but this wasn't enough
of a help. As the ACPI node doesn't contain anything valuable besides
the _DSD, it seems that a quirk for the system is a fine enough solution.
drivers/acpi/x86/utils.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
index 664070fc8349..d7cdd8406c84 100644
--- a/drivers/acpi/x86/utils.c
+++ b/drivers/acpi/x86/utils.c
@@ -207,9 +207,26 @@ static const struct x86_cpu_id storage_d3_cpu_ids[] = {
{}
};
+static const struct dmi_system_id force_storage_d3_dmi[] = {
+ {
+ /*
+ * _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME
+ * but .NVME is needed to get StorageD3Enable node
+ * https://bugzilla.kernel.org/show_bug.cgi?id=216440
+ */
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"),
+ }
+ },
+ {}
+};
+
bool force_storage_d3(void)
{
- return x86_match_cpu(storage_d3_cpu_ids);
+ const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi);
+
+ return dmi_id || x86_match_cpu(storage_d3_cpu_ids);
}
/*
--
2.34.1
Hi,
On 9/15/22 20:23, Mario Limonciello wrote:
> Dell Inspiron 14 2-in-1 has two ACPI nodes under GPP1 both with _ADR of
> 0, both without _HID. It's ambiguous which the kernel should take, but
> it seems to take "DEV0". Unfortunately "DEV0" is missing the device
> property `StorageD3Enable` which is present on "NVME".
>
> To avoid this causing problems for suspend, add a quirk for this system
> to behave like `StorageD3Enable` property was found.
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=216440
> Reported-and-tested-by: Luya Tshimbalanga <[email protected]>
> Signed-off-by: Mario Limonciello <[email protected]>
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <[email protected]>
Regards,
Hans
> ---
> I had attempted to modify the heuristics for when two ACPI devices
> have the same _ADR to prefer the one with a _DSD, but this wasn't enough
> of a help. As the ACPI node doesn't contain anything valuable besides
> the _DSD, it seems that a quirk for the system is a fine enough solution.
>
> drivers/acpi/x86/utils.c | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
> index 664070fc8349..d7cdd8406c84 100644
> --- a/drivers/acpi/x86/utils.c
> +++ b/drivers/acpi/x86/utils.c
> @@ -207,9 +207,26 @@ static const struct x86_cpu_id storage_d3_cpu_ids[] = {
> {}
> };
>
> +static const struct dmi_system_id force_storage_d3_dmi[] = {
> + {
> + /*
> + * _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME
> + * but .NVME is needed to get StorageD3Enable node
> + * https://bugzilla.kernel.org/show_bug.cgi?id=216440
> + */
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"),
> + }
> + },
> + {}
> +};
> +
> bool force_storage_d3(void)
> {
> - return x86_match_cpu(storage_d3_cpu_ids);
> + const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi);
> +
> + return dmi_id || x86_match_cpu(storage_d3_cpu_ids);
> }
>
> /*
On Fri, Sep 16, 2022 at 10:43 AM Hans de Goede <[email protected]> wrote:
>
> Hi,
>
> On 9/15/22 20:23, Mario Limonciello wrote:
> > Dell Inspiron 14 2-in-1 has two ACPI nodes under GPP1 both with _ADR of
> > 0, both without _HID. It's ambiguous which the kernel should take, but
> > it seems to take "DEV0". Unfortunately "DEV0" is missing the device
> > property `StorageD3Enable` which is present on "NVME".
> >
> > To avoid this causing problems for suspend, add a quirk for this system
> > to behave like `StorageD3Enable` property was found.
> >
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=216440
> > Reported-and-tested-by: Luya Tshimbalanga <[email protected]>
> > Signed-off-by: Mario Limonciello <[email protected]>
>
> Thanks, patch looks good to me:
>
> Reviewed-by: Hans de Goede <[email protected]>
Applied as 6.1 material, thanks!
> > ---
> > I had attempted to modify the heuristics for when two ACPI devices
> > have the same _ADR to prefer the one with a _DSD, but this wasn't enough
> > of a help. As the ACPI node doesn't contain anything valuable besides
> > the _DSD, it seems that a quirk for the system is a fine enough solution.
> >
> > drivers/acpi/x86/utils.c | 19 ++++++++++++++++++-
> > 1 file changed, 18 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c
> > index 664070fc8349..d7cdd8406c84 100644
> > --- a/drivers/acpi/x86/utils.c
> > +++ b/drivers/acpi/x86/utils.c
> > @@ -207,9 +207,26 @@ static const struct x86_cpu_id storage_d3_cpu_ids[] = {
> > {}
> > };
> >
> > +static const struct dmi_system_id force_storage_d3_dmi[] = {
> > + {
> > + /*
> > + * _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME
> > + * but .NVME is needed to get StorageD3Enable node
> > + * https://bugzilla.kernel.org/show_bug.cgi?id=216440
> > + */
> > + .matches = {
> > + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
> > + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"),
> > + }
> > + },
> > + {}
> > +};
> > +
> > bool force_storage_d3(void)
> > {
> > - return x86_match_cpu(storage_d3_cpu_ids);
> > + const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi);
> > +
> > + return dmi_id || x86_match_cpu(storage_d3_cpu_ids);
> > }
> >
> > /*
>