Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7959916 authored by Maxime Bizon's avatar Maxime Bizon Committed by Ingo Molnar
Browse files

x86/ce4100: Fix reboot by forcing the reboot method to be KBD 



The default reboot is via ACPI for this platform, and the CEFDK
bootloader actually supports this, but will issue a system power
off instead of a real reboot. Setting the reboot method to be
KBD instead of ACPI ensures proper system reboot.

Acked-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarMaxime Bizon <mbizon@freebox.fr>
Signed-off-by: default avatarFlorian Fainelli <ffainelli@freebox.fr>
Cc: rui.zhang@intel.com
Cc: alan@linux.intel.com
Link: http://lkml.kernel.org/r/1351518020-25556-3-git-send-email-ffainelli@freebox.fr


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f49f4ab9

arch/x86/platform/ce4100/ce4100.c

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/i8259.h>

#include <asm/io.h>

#include <asm/io_apic.h>

#include <asm/emergency-restart.h>



static int ce4100_i8042_detect(void)

{
@@ -151,6 +152,15 @@ void __init x86_ce4100_early_setup(void) 
	x86_init.mpparse.find_smp_config = x86_init_noop;

	x86_init.pci.init = ce4100_pci_init;



	/*

	 * By default, the reboot method is ACPI which is supported by the

	 * CE4100 bootloader CEFDK using FADT.ResetReg Address and ResetValue

	 * the bootloader will however issue a system power off instead of

	 * reboot. By using BOOT_KBD we ensure proper system reboot as

	 * expected.

	 */

	reboot_type = BOOT_KBD;



#ifdef CONFIG_X86_IO_APIC

	x86_init.pci.init_irq = sdv_pci_init;

	x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;