lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86, smp: refactor ->smp_callin_clear_local_apic() methods

Browse Source 
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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-01-28 16:31:52 +01:00
parent a965936643
commit 333344d943
10 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/include/asm/es7000/wakecpu.h
View File

@@ -13,11 +13,6 @@ static inline void es7000_wait_for_init_deassert(atomic_t *deassert)
return; 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) static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
{ {
} }

5
arch/x86/include/asm/mach-default/mach_wakecpu.h
View File

@@ -8,11 +8,6 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
return; 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) static inline void store_NMI_vector(unsigned short *high, unsigned short *low)
{ {
} }

1
arch/x86/include/asm/mach-generic/mach_wakecpu.h
View File

@@ -1,7 +1,6 @@
#ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H #ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H
#define _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 store_NMI_vector (apic->store_NMI_vector)
#define restore_NMI_vector (apic->restore_NMI_vector) #define restore_NMI_vector (apic->restore_NMI_vector)
#define inquire_remote_apic (apic->inquire_remote_apic) #define inquire_remote_apic (apic->inquire_remote_apic)

4
arch/x86/include/asm/numaq/wakecpu.h
View File

@@ -8,9 +8,9 @@
/* /*
* Because we use NMIs rather than the INIT-STARTUP sequence to * 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(); clear_local_APIC();
} }

3
arch/x86/kernel/smpboot.c
View File

@@ -244,7 +244,8 @@ static void __cpuinit smp_callin(void)
*/ */
pr_debug("CALLIN, before setup_local_APIC().\n"); 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(); setup_local_APIC();
end_local_APIC_setup(); end_local_APIC_setup();
map_cpu_to_logical_apicid(); map_cpu_to_logical_apicid();

3
arch/x86/mach-generic/bigsmp.c
View File

@@ -109,7 +109,8 @@ struct genapic apic_bigsmp = {
.wait_for_init_deassert = default_wait_for_init_deassert, .wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = smp_callin_clear_local_apic, .smp_callin_clear_local_apic = NULL,
.store_NMI_vector = store_NMI_vector, .store_NMI_vector = store_NMI_vector,
.restore_NMI_vector = restore_NMI_vector, .restore_NMI_vector = restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic, .inquire_remote_apic = inquire_remote_apic,

2
arch/x86/mach-generic/default.c
View File

@@ -90,7 +90,7 @@ struct genapic apic_default = {
.wait_for_init_deassert = default_wait_for_init_deassert, .wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = smp_callin_clear_local_apic, .smp_callin_clear_local_apic = NULL,
.store_NMI_vector = store_NMI_vector, .store_NMI_vector = store_NMI_vector,
.restore_NMI_vector = restore_NMI_vector, .restore_NMI_vector = restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic, .inquire_remote_apic = inquire_remote_apic,

4
arch/x86/mach-generic/es7000.c
View File

@@ -145,7 +145,9 @@ struct genapic apic_es7000 = {
.wait_for_init_deassert = default_wait_for_init_deassert, .wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = smp_callin_clear_local_apic, /* Nothing to do for most platforms, since cleared by the INIT cycle: */
.smp_callin_clear_local_apic = NULL,
.store_NMI_vector = store_NMI_vector, .store_NMI_vector = store_NMI_vector,
.restore_NMI_vector = restore_NMI_vector, .restore_NMI_vector = restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic, .inquire_remote_apic = inquire_remote_apic,

2
arch/x86/mach-generic/numaq.c
View File

@@ -110,7 +110,7 @@ struct genapic apic_numaq = {
/* We don't do anything here because we use NMI's to boot instead */ /* We don't do anything here because we use NMI's to boot instead */
.wait_for_init_deassert = NULL, .wait_for_init_deassert = NULL,
.smp_callin_clear_local_apic = smp_callin_clear_local_apic, .smp_callin_clear_local_apic = numaq_smp_callin_clear_local_apic,
.store_NMI_vector = store_NMI_vector, .store_NMI_vector = store_NMI_vector,
.restore_NMI_vector = restore_NMI_vector, .restore_NMI_vector = restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic, .inquire_remote_apic = inquire_remote_apic,

3
arch/x86/mach-generic/summit.c
View File

@@ -89,7 +89,8 @@ struct genapic apic_summit = {
.wait_for_init_deassert = default_wait_for_init_deassert, .wait_for_init_deassert = default_wait_for_init_deassert,
.smp_callin_clear_local_apic = smp_callin_clear_local_apic, .smp_callin_clear_local_apic = NULL,
.store_NMI_vector = store_NMI_vector, .store_NMI_vector = store_NMI_vector,
.restore_NMI_vector = restore_NMI_vector, .restore_NMI_vector = restore_NMI_vector,
.inquire_remote_apic = inquire_remote_apic, .inquire_remote_apic = inquire_remote_apic,