Skip to content

Commit 018d671

Browse files
superm1rafaeljw
authored andcommitted
ACPI: x86: Add a quirk for Dell Inspiron 14 2-in-1 for StorageD3Enable
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]> Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 521a547 commit 018d671

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

drivers/acpi/x86/utils.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,26 @@ static const struct x86_cpu_id storage_d3_cpu_ids[] = {
207207
{}
208208
};
209209

210+
static const struct dmi_system_id force_storage_d3_dmi[] = {
211+
{
212+
/*
213+
* _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME
214+
* but .NVME is needed to get StorageD3Enable node
215+
* https://bugzilla.kernel.org/show_bug.cgi?id=216440
216+
*/
217+
.matches = {
218+
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
219+
DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"),
220+
}
221+
},
222+
{}
223+
};
224+
210225
bool force_storage_d3(void)
211226
{
212-
return x86_match_cpu(storage_d3_cpu_ids);
227+
const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi);
228+
229+
return dmi_id || x86_match_cpu(storage_d3_cpu_ids);
213230
}
214231

215232
/*

0 commit comments

Comments
 (0)