x86/apic: Split local APIC timer setup from the APIC setup

apic_bsp_setup() sets up the local APIC, I/O APIC and APIC timer.

The local APIC and I/O APIC setup belongs to interrupt delivery mode
setup. Setting up the local APIC timer for booting CPU is another job
and has nothing to do with interrupt delivery mode setup.

Split local APIC timer setup from the APIC setup, keep it in the original
position for SMP and UP kernel for now.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: yinghai@kernel.org
Cc: bhe@redhat.com
Link: https://lkml.kernel.org/r/1505293975-26005-4-git-send-email-douly.fnst@cn.fujitsu.com

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 08585bcbb38ff93f3468dae397862f1fac462553..ad373243c7b3dd1433658d6e781c54c01f866167 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2397,8 +2397,6 @@ int __init apic_bsp_setup(bool upmode)
        end_local_APIC_setup();
        irq_remap_enable_fault_handling();
        setup_IO_APIC();
-       /* Setup local timer */
-       x86_init.timers.setup_percpu_clockev();
        return id;
 }
 
@@ -2438,6 +2436,8 @@ int __init APIC_init_uniprocessor(void)
 
        default_setup_apic_routing();
        apic_bsp_setup(true);
+       /* Setup local timer */
+       x86_init.timers.setup_percpu_clockev();
        return 0;
 }
 

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ad59edd84de70cfb978b8c0bc2ac38b892418b71..dad0a099e4339dceb4f69a31c5648fbfade560f2 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1340,6 +1340,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
        case SMP_FORCE_UP:
                disable_smp();
                apic_bsp_setup(false);
+               /* Setup local timer */
+               x86_init.timers.setup_percpu_clockev();
                return;
        case SMP_OK:
                break;
@@ -1354,6 +1356,9 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
        default_setup_apic_routing();
        cpu0_logical_apicid = apic_bsp_setup(false);
 
+       /* Setup local timer */
+       x86_init.timers.setup_percpu_clockev();
+
        pr_info("CPU0: ");
        print_cpu_info(&cpu_data(0));