From: "tip-bot2 for Hill Ma" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Hill Ma <maahiuzeon@gmail.com>, Borislav Petkov <bp@suse.de>,
stable@vger.kernel.org, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/misc] x86/reboot/quirks: Add MacBook6,1 reboot quirk
Date: Mon, 25 May 2020 17:41:46 -0000 [thread overview]
Message-ID: <159042850682.17951.11521556361108377524.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200425200641.GA1554@cslab.localdomain>
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",
prev parent reply other threads:[~2020-05-25 17:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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-bot2 for Hill Ma [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159042850682.17951.11521556361108377524.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maahiuzeon@gmail.com \
--cc=stable@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).