Commit fb3bd7b1 authored Mar 05, 2014 by H. Peter Anvin

x86, reboot: Only use CF9_COND automatically, not CF9

Only CF9_COND is appropriate for inclusion in the default chain, not
CF9; the latter will poke that register unconditionally, whereas
CF9_COND will at least look for PCI configuration method #1 or #2
first (a weak check, but better than nothing.)

CF9 should be used for explicit system configuration (command line or
DMI) only.

Cc: Aubrey Li <aubrey.li@intel.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Link: http://lkml.kernel.org/r/53130A46.1010801@linux.intel.com


Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent a4f1987e

arch/x86/kernel/reboot.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ static void native_machine_emergency_restart(void)
		EFI_RESET_WARM :
		EFI_RESET_COLD,
		EFI_SUCCESS, 0, NULL);
		reboot_type = BOOT_CF9;
		reboot_type = BOOT_CF9_COND;
		break;

		case BOOT_CF9:

Admin message