* [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk
@ 2020-04-25 20:06 Hill Ma
2020-05-08 7:27 ` Hill Ma
2020-05-25 17:41 ` [tip: x86/misc] " tip-bot2 for Hill Ma
0 siblings, 2 replies; 5+ messages in thread
From: Hill Ma @ 2020-04-25 20:06 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov; +Cc: x86, linux-kernel
On MacBook6,1 reboot would hang unless parameter reboot=pci is added.
This makes it automatic.
Same as https://lkml.org/lkml/2020/4/5/221 with a bigger number of recipients.
Applies to next-20200424.
Cc: stable@vger.kernel.org
Signed-off-by: Hill Ma <maahiuzeon@gmail.com>
---
arch/x86/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 3ca43be4f..8b8cebfd3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -197,6 +197,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),
},
},
+ { /* Handle problems with rebooting on Apple MacBook6,1 */
+ .callback = set_pci_reboot,
+ .ident = "Apple MacBook6,1",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),
+ },
+ },
{ /* Handle problems with rebooting on Apple MacBookPro5 */
.callback = set_pci_reboot,
.ident = "Apple MacBookPro5",
--
2.26.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk
2020-04-25 20:06 [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk Hill Ma
@ 2020-05-08 7:27 ` Hill Ma
2020-05-24 0:39 ` Hill Ma
2020-05-25 17:41 ` [tip: x86/misc] " tip-bot2 for Hill Ma
1 sibling, 1 reply; 5+ messages in thread
From: Hill Ma @ 2020-05-08 7:27 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, Borislav Petkov; +Cc: x86, linux-kernel
ping?
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip: x86/misc] x86/reboot/quirks: Add MacBook6,1 reboot quirk
2020-04-25 20:06 [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk Hill Ma
2020-05-08 7:27 ` Hill Ma
@ 2020-05-25 17:41 ` tip-bot2 for Hill Ma
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot2 for Hill Ma @ 2020-05-25 17:41 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Hill Ma, Borislav Petkov, stable, x86, LKML
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 140fd4ac78d385e6c8e6a5757585f6c707085f87
Gitweb: https://git.kernel.org/tip/140fd4ac78d385e6c8e6a5757585f6c707085f87
Author: Hill Ma <maahiuzeon@gmail.com>
AuthorDate: Sat, 25 Apr 2020 13:06:41 -07:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 25 May 2020 18:11:23 +02:00
x86/reboot/quirks: Add MacBook6,1 reboot quirk
On MacBook6,1 reboot would hang unless parameter reboot=pci is added.
Make it automatic.
Signed-off-by: Hill Ma <maahiuzeon@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20200425200641.GA1554@cslab.localdomain
---
arch/x86/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 3ca43be..8b8cebf 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -197,6 +197,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),
},
},
+ { /* Handle problems with rebooting on Apple MacBook6,1 */
+ .callback = set_pci_reboot,
+ .ident = "Apple MacBook6,1",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),
+ },
+ },
{ /* Handle problems with rebooting on Apple MacBookPro5 */
.callback = set_pci_reboot,
.ident = "Apple MacBookPro5",
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk
@ 2020-04-05 17:39 Hill Ma
0 siblings, 0 replies; 5+ messages in thread
From: Hill Ma @ 2020-04-05 17:39 UTC (permalink / raw)
To: tglx; +Cc: linux-kernel
On MacBook6,1 reboot would hang unless parameter reboot=pci is added.
This makes it automatic.
Signed-off-by: Hill Ma <maahiuzeon@gmail.com>
---
arch/x86/kernel/reboot.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 3ca43be4f..8b8cebfd3 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -197,6 +197,14 @@ static const struct dmi_system_id reboot_dmi_table[] __initconst = {
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook5"),
},
},
+ { /* Handle problems with rebooting on Apple MacBook6,1 */
+ .callback = set_pci_reboot,
+ .ident = "Apple MacBook6,1",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "MacBook6,1"),
+ },
+ },
{ /* Handle problems with rebooting on Apple MacBookPro5 */
.callback = set_pci_reboot,
.ident = "Apple MacBookPro5",
--
2.26.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-25 17:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-25 20:06 [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk Hill Ma
2020-05-08 7:27 ` Hill Ma
2020-05-24 0:39 ` Hill Ma
2020-05-25 17:41 ` [tip: x86/misc] " tip-bot2 for Hill Ma
-- strict thread matches above, loose matches on Subject: below --
2020-04-05 17:39 [PATCH] " Hill Ma
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox