[PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk

[PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk

[Heiner Kallweit]

On this system the M.2 PCIe WiFi card isn't detected after reboot,
only after cold boot. reboot=pci fixes this behavior.
In [0] the same issue is described, although on another system and
with another Intel WiFi card. In case it's relevant, both systems
have Celeron CPU's.
The dicussion in [0] involved the PCI maintainer, and proposal was
to go with the PCI reboot quirk on affected systems until a more
generic fix is available.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=202399

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 arch/x86/kernel/reboot.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index db115943e..9991c5920 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -477,6 +477,15 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
 		},
 	},
 
+	{	/* PCIe Wifi card isn't detected after reboot otherwise */
+		.callback = set_pci_reboot,
+		.ident = "Zotac ZBOX CI327 nano",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "NA"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ZBOX-CI327NANO-GS-01"),
+		},
+	},
+
 	/* Sony */
 	{	/* Handle problems with rebooting on Sony VGN-Z540N */
 		.callback = set_bios_reboot,
-- 
2.29.2

Re: [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk

[Borislav Petkov]

On Tue, Dec 01, 2020 at 12:39:57PM +0100, Heiner Kallweit wrote:
> On this system the M.2 PCIe WiFi card isn't detected after reboot,
> only after cold boot. reboot=pci fixes this behavior.
> In [0] the same issue is described, although on another system and
> with another Intel WiFi card. In case it's relevant, both systems
> have Celeron CPU's.
> The dicussion in [0] involved the PCI maintainer, and proposal was
> to go with the PCI reboot quirk on affected systems until a more
> generic fix is available.
> 
> [0] https://bugzilla.kernel.org/show_bug.cgi?id=202399

But this quirk is for your system only - the one in the bugzilla entry
would need another one? Or?

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk

[Heiner Kallweit]

Am 10.12.2020 um 20:04 schrieb Borislav Petkov:
> On Tue, Dec 01, 2020 at 12:39:57PM +0100, Heiner Kallweit wrote:
>> On this system the M.2 PCIe WiFi card isn't detected after reboot,
>> only after cold boot. reboot=pci fixes this behavior.
>> In [0] the same issue is described, although on another system and
>> with another Intel WiFi card. In case it's relevant, both systems
>> have Celeron CPU's.
>> The dicussion in [0] involved the PCI maintainer, and proposal was
>> to go with the PCI reboot quirk on affected systems until a more
>> generic fix is available.
>>
>> [0] https://bugzilla.kernel.org/show_bug.cgi?id=202399
> 
> But this quirk is for your system only - the one in the bugzilla entry
> would need another one? Or?
> 
Right, as Bjorn wrote in comment 14:
".., and there may be many systems with this issue and we may be adding
such quirks frequently.  But maybe that's the only option, since we
don't know any other way to fix this."

I'd prefer that the autor of a quirk also has the hw to test it on.
Therefore I just added the quirk for my system as a template to the
bug report.

> Thx.
> 

Heiner

[tip: x86/misc] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk

[tip-bot2 for Heiner Kallweit]

The following commit has been merged into the x86/misc branch of tip:

Commit-ID:     4b2d8ca9208be636b30e924b1cbcb267b0740c93
Gitweb:        https://git.kernel.org/tip/4b2d8ca9208be636b30e924b1cbcb267b0740c93
Author:        Heiner Kallweit <hkallweit1@gmail.com>
AuthorDate:    Tue, 01 Dec 2020 12:39:57 +01:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 30 Dec 2020 18:38:39 +01:00

x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk

On this system the M.2 PCIe WiFi card isn't detected after reboot, only
after cold boot. reboot=pci fixes this behavior. In [0] the same issue
is described, although on another system and with another Intel WiFi
card. In case it's relevant, both systems have Celeron CPUs.

Add a PCI reboot quirk on affected systems until a more generic fix is
available.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=202399

 [ bp: Massage commit message. ]

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/1524eafd-f89c-cfa4-ed70-0bde9e45eec9@gmail.com
---
 arch/x86/kernel/reboot.c |  9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index db11594..9991c59 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -477,6 +477,15 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
 		},
 	},
 
+	{	/* PCIe Wifi card isn't detected after reboot otherwise */
+		.callback = set_pci_reboot,
+		.ident = "Zotac ZBOX CI327 nano",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "NA"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ZBOX-CI327NANO-GS-01"),
+		},
+	},
+
 	/* Sony */
 	{	/* Handle problems with rebooting on Sony VGN-Z540N */
 		.callback = set_bios_reboot,