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

Commit 333344d9 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, smp: refactor ->smp_callin_clear_local_apic() methods 



Only NUMAQ does something substantial here, because it initializes
via NMIs (not via INIT as standard SMP startup) - so it needs to
reset the APIC.

 - extend the generic code to handle NULL methods

 - clear out dummy methods and replace them with NULL

 - clean up: remove wrapper macros, etc.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a9659366

arch/x86/include/asm/es7000/wakecpu.h

+0 −5
Original line number Diff line number Diff line
@@ -13,11 +13,6 @@ static inline void es7000_wait_for_init_deassert(atomic_t *deassert) 
	return;

}



/* Nothing to do for most platforms, since cleared by the INIT cycle */

static inline void smp_callin_clear_local_apic(void)

{

}



static inline void store_NMI_vector(unsigned short *high, unsigned short *low)

{

}

arch/x86/include/asm/mach-default/mach_wakecpu.h

+0 −5
Original line number Diff line number Diff line
@@ -8,11 +8,6 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert) 
	return;

}



/* Nothing to do for most platforms, since cleared by the INIT cycle */

static inline void smp_callin_clear_local_apic(void)

{

}



static inline void store_NMI_vector(unsigned short *high, unsigned short *low)

{

}

arch/x86/include/asm/mach-generic/mach_wakecpu.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H

#define _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H



#define smp_callin_clear_local_apic (apic->smp_callin_clear_local_apic)

#define store_NMI_vector (apic->store_NMI_vector)

#define restore_NMI_vector (apic->restore_NMI_vector)

#define inquire_remote_apic (apic->inquire_remote_apic)

arch/x86/include/asm/numaq/wakecpu.h

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 


/*

 * Because we use NMIs rather than the INIT-STARTUP sequence to

 * bootstrap the CPUs, the APIC may be in a weird state. Kick it.

 * bootstrap the CPUs, the APIC may be in a weird state. Kick it:

 */

static inline void smp_callin_clear_local_apic(void)

static inline void numaq_smp_callin_clear_local_apic(void)

{

	clear_local_APIC();

}

arch/x86/kernel/smpboot.c

+2 −1
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static void __cpuinit smp_callin(void) 
	 */



	pr_debug("CALLIN, before setup_local_APIC().\n");

	smp_callin_clear_local_apic();

	if (apic->smp_callin_clear_local_apic)

		apic->smp_callin_clear_local_apic();

	setup_local_APIC();

	end_local_APIC_setup();

	map_cpu_to_logical_apicid();