diff options
Diffstat (limited to 'drivers/acpi/x86/utils.c')
| -rw-r--r-- | drivers/acpi/x86/utils.c | 19 | 
1 files changed, 18 insertions, 1 deletions
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);  }  /*  | 
