Bug#1036530: linux-signed-amd64: Hard lock up of system

[Nick Hastings <nicholaschastings@gmail.com>]

Hi,

* Salvatore Bonaccorso <carnil@debian.org> [230524 19:26]:
>
> Given you were able to bisect it so far, can you try to isolate the
> commit from the merge commit causing it?

I guess I can try. The commit message states:

Merge: c77f54a9bcec a1cf1fd62ae7 562163595a91 018d6711c26e 6cc401be1648

Is there a way extract out each of those?

> One remotely related might be "ACPI: x86: Add a quirk for Dell
> Inspiron 14 2-in-1 for StorageD3Enable".

Manually looking at the diff with
git diff e996c7e01892ac18ec0db447294d4f591c325efe~  e996c7e01892ac18ec0db447294d4f591c325efe 
I guess that means the following:

--- 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);
 }
 

Thanks,

Nick.