Commit b47b9288 authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

x86: drop REBOOT_CF9_COND from reboot fallback chain 



Impact: Reverts sequence of reboot fallbacks

Checkin 14d7ca5c changed the default
reboot method to "pci", a.k.a. port CF9.  Unfortunately this has been
shown to cause lockups on at least two systems for which REBOOT_KBD
worked, both Thinkpads with Intel chipsets.  Checkin
3889d0ce reverted the default, but did
not revert the fallback chain.  This checkin reverts the fallback
chain; port CF9 is now only done by explicit "reboot=pci" or a future
potential DMI key.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 3889d0ce

arch/x86/kernel/reboot.c

+4 −4
Original line number Diff line number Diff line
@@ -384,20 +384,20 @@ static void native_machine_emergency_restart(void) 
			load_idt(&no_idt);

			__asm__ __volatile__("int3");



			reboot_type = BOOT_CF9_COND;

			reboot_type = BOOT_KBD;

			break;



#ifdef CONFIG_X86_32

		case BOOT_BIOS:

			machine_real_restart(jump_to_bios, sizeof(jump_to_bios));



			reboot_type = BOOT_CF9_COND;

			reboot_type = BOOT_KBD;

			break;

#endif



		case BOOT_ACPI:

			acpi_reboot();

			reboot_type = BOOT_CF9_COND;

			reboot_type = BOOT_KBD;

			break;



		case BOOT_EFI:
@@ -406,7 +406,7 @@ static void native_machine_emergency_restart(void) 
						 EFI_RESET_WARM :

						 EFI_RESET_COLD,

						 EFI_SUCCESS, 0, NULL);

			reboot_type = BOOT_CF9_COND;

			reboot_type = BOOT_KBD;

			break;



		case BOOT_CF9:

CRA Git | Maintained and supported by SUSTech CRA and CCSE