Messages in this thread | | | Date | Tue, 14 Apr 2009 20:31:43 +0400 | From | Cyrill Gorcunov <> | Subject | Re: [PATCH 01/14] [VOYAGER] x86: add {safe,hard}_smp_processor_id to smp_ops |
| |
[James Bottomley - Tue, Apr 14, 2009 at 10:51:27AM -0500] | Not having apics, Voyager can't use the default apic implementation of | these, it has to read from a special port in the VIC to get the | processor ID, so abstract these functions in smp_ops to allow voyager | to live simultaneously with the apic code. | | Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> | --- | arch/x86/include/asm/smp.h | 13 +++++++++++-- | arch/x86/kernel/apic/apic.c | 5 ----- | arch/x86/kernel/apic/ipi.c | 2 +- | arch/x86/kernel/smp.c | 7 +++++++ | arch/x86/xen/smp.c | 7 +++++++ | 5 files changed, 26 insertions(+), 8 deletions(-) | | diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h | index 19e0d88..aac866f 100644 | --- a/arch/x86/include/asm/smp.h | +++ b/arch/x86/include/asm/smp.h | @@ -60,6 +60,8 @@ struct smp_ops { | | void (*send_call_func_ipi)(const struct cpumask *mask); | void (*send_call_func_single_ipi)(int cpu); | + int (*hard_smp_processor_id)(void); | + int (*safe_smp_processor_id)(void); | }; | | /* Globals due to paravirt */ | @@ -159,7 +161,11 @@ extern unsigned disabled_cpus __cpuinitdata; | * so this is correct in the x86 case. | */ | #define raw_smp_processor_id() (percpu_read(cpu_number)) | -extern int safe_smp_processor_id(void); | +int apic_safe_smp_processor_id(void); | +static inline int safe_smp_processor_id(void) | +{ | + return smp_ops.safe_smp_processor_id(); | +} | | #elif defined(CONFIG_X86_64_SMP) | #define raw_smp_processor_id() (percpu_read(cpu_number)) | @@ -185,7 +191,10 @@ static inline int logical_smp_processor_id(void) | | #endif | | -extern int hard_smp_processor_id(void); | +static inline int hard_smp_processor_id(void) | +{ | + return smp_ops.hard_smp_processor_id(); | +} |
Hi James, wouldn't it break summit32 platform? This snippet from summit_32.c
static void summit_init_apic_ldr(void) { unsigned long val, id; int count = 0; ---> u8 my_id = (u8)hard_smp_processor_id(); u8 my_cluster = APIC_CLUSTER(my_id);
if we have CONFIG_SMP _not_ set smp_ops.hard_smp_processor_id would be plain NULL deref (or linker warning)? I could be missing something... Cyrill
| |