mirror of https://gitee.com/openkylin/linux.git
Use the APIC to determine the hardware processor id - i386
hard_smp_processor_id used to be just a macro that hard-coded hard_smp_processor_id to 0 in the non SMP case. When booting non SMP kernels on hardware where the boot ioapic id is not 0 this turns out to be a problem. This is happens frequently in the case of kdump and once in a great while in the case of real hardware. Use the APIC to determine the hardware processor id in both UP and SMP kernels to fix this issue. Notice that hard_smp_processor_id is only used by SMP code or by code that works with apics so we do not need to handle the case when apics are not present and hard_smp_processor_id should never be called there. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Cc: "Luck, Tony" <tony.luck@intel.com> Acked-by: Andi Kleen <ak@suse.de> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
2f4dfe206a
commit
a36166c6ef
|
@ -119,9 +119,7 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
int hard_smp_processor_id(void)
|
||||
{
|
||||
return genapic->get_apic_id(*(unsigned long *)(APIC_BASE+APIC_ID));
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -124,6 +124,24 @@ static inline int num_booting_cpus(void)
|
|||
return cpus_weight(cpu_callout_map);
|
||||
}
|
||||
|
||||
extern int safe_smp_processor_id(void);
|
||||
extern int __cpu_disable(void);
|
||||
extern void __cpu_die(unsigned int cpu);
|
||||
extern unsigned int num_processors;
|
||||
|
||||
#endif /* !__ASSEMBLY__ */
|
||||
|
||||
#else /* CONFIG_SMP */
|
||||
|
||||
#define safe_smp_processor_id() 0
|
||||
#define cpu_physical_id(cpu) boot_cpu_physical_apicid
|
||||
|
||||
#define NO_PROC_ID 0xFF /* No processor magic marker */
|
||||
|
||||
#endif /* CONFIG_SMP */
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
|
||||
#ifdef APIC_DEFINITION
|
||||
|
@ -135,27 +153,15 @@ static inline int hard_smp_processor_id(void)
|
|||
/* we don't want to mark this access volatile - bad code generation */
|
||||
return GET_APIC_ID(*(unsigned long *)(APIC_BASE+APIC_ID));
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
#endif /* APIC_DEFINITION */
|
||||
|
||||
extern int safe_smp_processor_id(void);
|
||||
extern int __cpu_disable(void);
|
||||
extern void __cpu_die(unsigned int cpu);
|
||||
extern unsigned int num_processors;
|
||||
|
||||
#endif /* !__ASSEMBLY__ */
|
||||
|
||||
#else /* CONFIG_SMP */
|
||||
#else /* CONFIG_X86_LOCAL_APIC */
|
||||
|
||||
#ifndef CONFIG_SMP
|
||||
#define hard_smp_processor_id() 0
|
||||
#define safe_smp_processor_id() 0
|
||||
#define cpu_physical_id(cpu) boot_cpu_physical_apicid
|
||||
#endif
|
||||
|
||||
#define NO_PROC_ID 0xFF /* No processor magic marker */
|
||||
|
||||
#endif /* CONFIG_SMP */
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#endif /* CONFIG_X86_LOCAL_APIC */
|
||||
|
||||
extern u8 apicid_2_node[];
|
||||
|
||||
|
|
Loading…
Reference in New Issue