lkml.org 
[lkml]   [2012]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] x86/ce4100: Fix reboot by forcing the reboot method to be KBD
    Commit-ID:  d7959916026aaae60e1878ae33c7503b2cc4471d
    Gitweb: http://git.kernel.org/tip/d7959916026aaae60e1878ae33c7503b2cc4471d
    Author: Maxime Bizon <mbizon@freebox.fr>
    AuthorDate: Mon, 29 Oct 2012 14:40:19 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Tue, 30 Oct 2012 10:16:46 +0100

    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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
    Signed-off-by: Florian 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: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/platform/ce4100/ce4100.c | 10 ++++++++++
    1 files changed, 10 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c
    index 5de16e3..92525cb 100644
    --- a/arch/x86/platform/ce4100/ce4100.c
    +++ b/arch/x86/platform/ce4100/ce4100.c
    @@ -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;

    \
     
     \ /
      Last update: 2012-10-30 14:01    [W:2.242 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site