lkml.org 
[lkml]   [2017]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 03/13] x86/apic: Split local APIC timer setup from the APIC setup
    Date
    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 preparation.

    Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
    ---
    arch/x86/kernel/apic/apic.c | 4 ++--
    arch/x86/kernel/smpboot.c | 5 +++++
    2 files changed, 7 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
    index 809625d..80a273d 100644
    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -2444,8 +2444,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;
    }

    @@ -2485,6 +2483,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 54b9e89..394cd81 100644
    --- a/arch/x86/kernel/smpboot.c
    +++ b/arch/x86/kernel/smpboot.c
    @@ -1337,6 +1337,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;
    @@ -1351,6 +1353,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));

    --
    2.5.5


    \
     
     \ /
      Last update: 2017-08-28 05:23    [W:4.110 / U:2.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site