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

Commit cbe879fc authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: define bios to apicid mapping 



This mapping already exists in x86_64, just provide it for
i386

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7e1efc0c

arch/x86/kernel/smpboot_32.c

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ void *x86_cpu_to_apicid_early_ptr; 
DEFINE_PER_CPU(u16, x86_cpu_to_apicid) = BAD_APICID;

EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid);



u16 x86_bios_cpu_apicid_init[NR_CPUS] __initdata

				= { [0 ... NR_CPUS-1] = BAD_APICID };

void *x86_bios_cpu_apicid_early_ptr;

DEFINE_PER_CPU(u16, x86_bios_cpu_apicid) = BAD_APICID;

EXPORT_PER_CPU_SYMBOL(x86_bios_cpu_apicid);



u8 apicid_2_node[MAX_APICID];



static void map_cpu_to_logical_apicid(void);

include/asm-x86/mach-bigsmp/mach_apic.h

+2 −5
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_APIC_H

#define __ASM_MACH_APIC_H





extern u8 bios_cpu_apicid[];



#define xapic_phys_to_log_apicid(cpu) (bios_cpu_apicid[cpu])

#define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))

#define esr_disable (1)



static inline int apic_id_registered(void)
@@ -90,7 +87,7 @@ static inline int apicid_to_node(int logical_apicid) 
static inline int cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < NR_CPUS)

		return (int) bios_cpu_apicid[mps_cpu];

		return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu);



	return BAD_APICID;

}

include/asm-x86/mach-es7000/mach_apic.h

+3 −5
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_APIC_H

#define __ASM_MACH_APIC_H



extern u8 bios_cpu_apicid[];



#define xapic_phys_to_log_apicid(cpu) (bios_cpu_apicid[cpu])

#define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)

#define esr_disable (1)



static inline int apic_id_registered(void)
@@ -80,7 +78,7 @@ extern void enable_apic_mode(void); 
extern int apic_version [MAX_APICS];

static inline void setup_apic_routing(void)

{

	int apic = bios_cpu_apicid[smp_processor_id()];

	int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id());

	printk("Enabling APIC mode:  %s.  Using %d I/O APICs, target cpus %lx\n",

		(apic_version[apic] == 0x14) ? 

		"Physical Cluster" : "Logical Cluster", nr_ioapics, cpus_addr(TARGET_CPUS)[0]);
@@ -102,7 +100,7 @@ static inline int cpu_present_to_apicid(int mps_cpu) 
	if (!mps_cpu)

		return boot_cpu_physical_apicid;

	else if (mps_cpu < NR_CPUS)

		return (int) bios_cpu_apicid[mps_cpu];

		return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu);

	else

		return BAD_APICID;

}

include/asm-x86/mach-summit/mach_apic.h

+1 −2
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ static inline unsigned long check_apicid_present(int bit) 


#define apicid_cluster(apicid) ((apicid) & XAPIC_DEST_CLUSTER_MASK)



extern u8 bios_cpu_apicid[];

extern u8 cpu_2_logical_apicid[];



static inline void init_apic_ldr(void)
@@ -110,7 +109,7 @@ static inline int cpu_to_logical_apicid(int cpu) 
static inline int cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < NR_CPUS)

		return (int)bios_cpu_apicid[mps_cpu];

		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);

	else

		return BAD_APICID;

}