| From 5e41933bd0715a8602cc01d6f34b7c4d0b877656 Mon Sep 17 00:00:00 2001 |
| From: Hill Ma <maahiuzeon@gmail.com> |
| Date: Sat, 25 Apr 2020 13:06:41 -0700 |
| Subject: [PATCH] x86/reboot/quirks: Add MacBook6,1 reboot quirk |
| |
| commit 140fd4ac78d385e6c8e6a5757585f6c707085f87 upstream. |
| |
| 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 |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c |
| index 09d6bded3c1e..3f677832fc12 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.27.0 |
| |
