[tip: x86/misc] x86/reboot/quirks: Add MacBook6,1 reboot quirk

[tip: x86/misc] x86/reboot/quirks: Add MacBook6,1 reboot quirk

[tip-bot2 for Hill Ma]

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",