* [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk
@ 2020-12-01 11:39 Heiner Kallweit
2020-12-10 19:04 ` Borislav Petkov
2020-12-30 17:50 ` [tip: x86/misc] x86/reboot: " tip-bot2 for Heiner Kallweit
0 siblings, 2 replies; 4+ messages in thread
From: Heiner Kallweit @ 2020-12-01 11:39 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, x86, H. Peter Anvin
Cc: Linux Kernel Mailing List
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk
2020-12-01 11:39 [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk Heiner Kallweit
@ 2020-12-10 19:04 ` Borislav Petkov
2020-12-10 20:32 ` Heiner Kallweit
2020-12-30 17:50 ` [tip: x86/misc] x86/reboot: " tip-bot2 for Heiner Kallweit
1 sibling, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2020-12-10 19:04 UTC (permalink / raw)
To: Heiner Kallweit
Cc: Thomas Gleixner, Ingo Molnar, x86, H. Peter Anvin,
Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk
2020-12-10 19:04 ` Borislav Petkov
@ 2020-12-10 20:32 ` Heiner Kallweit
0 siblings, 0 replies; 4+ messages in thread
From: Heiner Kallweit @ 2020-12-10 20:32 UTC (permalink / raw)
To: Borislav Petkov
Cc: Thomas Gleixner, Ingo Molnar, x86, H. Peter Anvin,
Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: x86/misc] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk
2020-12-01 11:39 [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk Heiner Kallweit
2020-12-10 19:04 ` Borislav Petkov
@ 2020-12-30 17:50 ` tip-bot2 for Heiner Kallweit
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Heiner Kallweit @ 2020-12-30 17:50 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Heiner Kallweit, Borislav Petkov, x86, linux-kernel
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,
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-30 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-01 11:39 [PATCH] x86/reboot/quirks: Add Zotac ZBOX CI327 nano PCI reboot quirk Heiner Kallweit
2020-12-10 19:04 ` Borislav Petkov
2020-12-10 20:32 ` Heiner Kallweit
2020-12-30 17:50 ` [tip: x86/misc] x86/reboot: " tip-bot2 for Heiner Kallweit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).