| Message ID | 5c6ad9d0779fa59825731d58de37a6786f991d83.1498795030.git.douly.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 30 Jun 2017, Dou Liyang wrote: > /* > diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c > index 93f0cda..d6721f0 100644 > --- a/arch/x86/kernel/smpboot.c > +++ b/arch/x86/kernel/smpboot.c > @@ -1347,8 +1347,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) > } > > default_setup_apic_routing(); > - cpu0_logical_apicid = apic_bsp_setup(false); > - > + apic_bsp_setup(false); > + if (x2apic_mode) > + cpu0_logical_apicid = apic_read(APIC_LDR); > + else > + cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); Can you please move that into a seperate helper function? > /* Setup local timer */ > x86_init.timers.setup_percpu_clockev(); > > -- > 2.5.5 > > > >
Hi, Thomas At 07/03/2017 01:54 AM, Thomas Gleixner wrote: > On Fri, 30 Jun 2017, Dou Liyang wrote: >> /* >> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c >> index 93f0cda..d6721f0 100644 >> --- a/arch/x86/kernel/smpboot.c >> +++ b/arch/x86/kernel/smpboot.c >> @@ -1347,8 +1347,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) >> } >> >> default_setup_apic_routing(); >> - cpu0_logical_apicid = apic_bsp_setup(false); >> - >> + apic_bsp_setup(false); >> + if (x2apic_mode) >> + cpu0_logical_apicid = apic_read(APIC_LDR); >> + else >> + cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); > > Can you please move that into a seperate helper function? Yes, it will be a separate helper function in the next version. Thanks, dou. > >> /* Setup local timer */ >> x86_init.timers.setup_percpu_clockev(); >> >> -- >> 2.5.5 >> >> >> >> > > >
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index ddc16ff..c3bedbd 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -146,7 +146,7 @@ static inline int apic_force_enable(unsigned long addr) extern int apic_force_enable(unsigned long addr); #endif -extern int apic_bsp_setup(bool upmode); +extern void apic_bsp_setup(bool upmode); extern void apic_ap_setup(void); /* diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 63220ca..498edbe 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -2341,25 +2341,17 @@ static void __init apic_bsp_up_setup(void) * Returns: * apic_id of BSP APIC */ -int __init apic_bsp_setup(bool upmode) +void __init apic_bsp_setup(bool upmode) { - int id; - connect_bsp_APIC(); if (upmode) apic_bsp_up_setup(); setup_local_APIC(); - if (x2apic_mode) - id = apic_read(APIC_LDR); - else - id = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); - enable_IO_APIC(); end_local_APIC_setup(); irq_remap_enable_fault_handling(); setup_IO_APIC(); - return id; } /* diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 93f0cda..d6721f0 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1347,8 +1347,11 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) } default_setup_apic_routing(); - cpu0_logical_apicid = apic_bsp_setup(false); - + apic_bsp_setup(false); + if (x2apic_mode) + cpu0_logical_apicid = apic_read(APIC_LDR); + else + cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR)); /* Setup local timer */ x86_init.timers.setup_percpu_clockev();
apic_bsp_setup() sets and returns logical APIC ID for initializing cpu0_logical_apicid in SMP-capable system. The id has nothing to do with the initialization of local APIC and I/O APIC. And apic_bsp_setup() should be called for interrupt mode setup intently. Move the id setup to native_smp_prepare_cpus() for cleanup and mark apic_bsp_setup() void. Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- arch/x86/include/asm/apic.h | 2 +- arch/x86/kernel/apic/apic.c | 10 +--------- arch/x86/kernel/smpboot.c | 7 +++++-- 3 files changed, 7 insertions(+), 12 deletions(-)