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

Commit fa47f7e5 authored by Suresh Siddha's avatar Suresh Siddha Committed by H. Peter Anvin
Browse files

x86, x2apic: Simplify apic init in SMP and UP builds 



Move enable_IR_x2apic() inside the default_setup_apic_routing(),
and for SMP platforms, move the default_setup_apic_routing() after
smp_sanity_check(). This cleans up the code that tries to avoid multiple
calls to default_setup_apic_routing() when smp_sanity_check() fails (which
goes through the APIC_init_uniprocessor() path).

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20100827181049.173087246@sbsiddha-MOBL3.sc.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 62a92f4c

arch/x86/kernel/apic/apic.c

+0 −3
Original line number Diff line number Diff line
@@ -1665,10 +1665,7 @@ int __init APIC_init_uniprocessor(void) 
	}

#endif



#ifndef CONFIG_SMP

	enable_IR_x2apic();

	default_setup_apic_routing();

#endif



	verify_local_APIC();

	connect_bsp_APIC();

arch/x86/kernel/apic/probe_64.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb) 
 */

void __init default_setup_apic_routing(void)

{



	enable_IR_x2apic();



#ifdef CONFIG_X86_X2APIC

	if (x2apic_mode

#ifdef CONFIG_X86_UV

arch/x86/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -1109,8 +1109,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	}

	set_cpu_sibling_map(0);



	enable_IR_x2apic();

	default_setup_apic_routing();



	if (smp_sanity_check(max_cpus) < 0) {

		printk(KERN_INFO "SMP disabled\n");
@@ -1118,6 +1116,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
		goto out;

	}



	default_setup_apic_routing();



	preempt_disable();

	if (read_apic_id() != boot_cpu_physical_apicid) {

		panic("Boot APIC ID in local APIC unexpected (%d vs %d)",