arch/cpu: Rename mp_get_apic_id() and add_cpu_map_entry() function
This patch renames mp_get_apic_id() to cpu_get_apic_id() and add_cpu_map_entry() to cpu_add_map_entry() in order access it outside CONFIG_PARALLEL_MP kconfig scope. Also make below changes - Make cpu_add_map_entry() function available externally to call it from mp_init.c and lapic_cpu_init.c. BRANCH=none BUG=b:79562868 Change-Id: I6a6c85df055bc0b5fc8c850cfa04d50859067088 Signed-off-by: Subrata Banik <subrata.banik@intel.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32701 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
parent
1159a163cd
commit
7bc9036d16
|
@ -219,6 +219,35 @@ static void set_cpu_ops(struct device *cpu)
|
||||||
cpu->ops = driver ? driver->ops : NULL;
|
cpu->ops = driver ? driver->ops : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Keep track of default apic ids for SMM. */
|
||||||
|
static int cpus_default_apic_id[CONFIG_MAX_CPUS];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When CPUID executes with EAX set to 1, additional processor identification
|
||||||
|
* information is returned to EBX register:
|
||||||
|
* Default APIC ID: EBX[31-24] - this number is the 8 bit ID that is assigned
|
||||||
|
* to the local APIC on the processor during power on.
|
||||||
|
*/
|
||||||
|
static int initial_lapicid(void)
|
||||||
|
{
|
||||||
|
return cpuid_ebx(1) >> 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Function to keep track of cpu default apic_id */
|
||||||
|
void cpu_add_map_entry(unsigned int index)
|
||||||
|
{
|
||||||
|
cpus_default_apic_id[index] = initial_lapicid();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Returns default APIC id based on logical_cpu number or < 0 on failure. */
|
||||||
|
int cpu_get_apic_id(int logical_cpu)
|
||||||
|
{
|
||||||
|
if (logical_cpu >= CONFIG_MAX_CPUS || logical_cpu < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return cpus_default_apic_id[logical_cpu];
|
||||||
|
}
|
||||||
|
|
||||||
void cpu_initialize(unsigned int index)
|
void cpu_initialize(unsigned int index)
|
||||||
{
|
{
|
||||||
/* Because we busy wait at the printk spinlock.
|
/* Because we busy wait at the printk spinlock.
|
||||||
|
|
|
@ -135,20 +135,8 @@ struct mp_flight_plan {
|
||||||
static int global_num_aps;
|
static int global_num_aps;
|
||||||
static struct mp_flight_plan mp_info;
|
static struct mp_flight_plan mp_info;
|
||||||
|
|
||||||
struct cpu_map {
|
/* Keep track of device structure for each CPU. */
|
||||||
struct device *dev;
|
static struct device *cpus_dev[CONFIG_MAX_CPUS];
|
||||||
/* Keep track of default apic ids for SMM. */
|
|
||||||
int default_apic_id;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Keep track of APIC and device structure for each CPU. */
|
|
||||||
static struct cpu_map cpus[CONFIG_MAX_CPUS];
|
|
||||||
|
|
||||||
static inline void add_cpu_map_entry(const struct cpu_info *info)
|
|
||||||
{
|
|
||||||
cpus[info->index].dev = info->cpu;
|
|
||||||
cpus[info->index].default_apic_id = cpuid_ebx(1) >> 24;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void barrier_wait(atomic_t *b)
|
static inline void barrier_wait(atomic_t *b)
|
||||||
{
|
{
|
||||||
|
@ -212,9 +200,9 @@ static void asmlinkage ap_init(unsigned int cpu)
|
||||||
|
|
||||||
info = cpu_info();
|
info = cpu_info();
|
||||||
info->index = cpu;
|
info->index = cpu;
|
||||||
info->cpu = cpus[cpu].dev;
|
info->cpu = cpus_dev[cpu];
|
||||||
|
|
||||||
add_cpu_map_entry(info);
|
cpu_add_map_entry(info->index);
|
||||||
thread_init_cpu_info_non_bsp(info);
|
thread_init_cpu_info_non_bsp(info);
|
||||||
|
|
||||||
/* Fix up APIC id with reality. */
|
/* Fix up APIC id with reality. */
|
||||||
|
@ -411,7 +399,7 @@ static int allocate_cpu_devices(struct bus *cpu_bus, struct mp_params *p)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
new->name = processor_name;
|
new->name = processor_name;
|
||||||
cpus[i].dev = new;
|
cpus_dev[i] = new;
|
||||||
}
|
}
|
||||||
|
|
||||||
return max_cpus;
|
return max_cpus;
|
||||||
|
@ -589,7 +577,7 @@ static void init_bsp(struct bus *cpu_bus)
|
||||||
printk(BIOS_CRIT, "BSP index(%d) != 0!\n", info->index);
|
printk(BIOS_CRIT, "BSP index(%d) != 0!\n", info->index);
|
||||||
|
|
||||||
/* Track BSP in cpu_map structures. */
|
/* Track BSP in cpu_map structures. */
|
||||||
add_cpu_map_entry(info);
|
cpu_add_map_entry(info->index);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -667,15 +655,6 @@ static void mp_initialize_cpu(void)
|
||||||
cpu_initialize(info->index);
|
cpu_initialize(info->index);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Returns APIC id for coreboot CPU number or < 0 on failure. */
|
|
||||||
int mp_get_apic_id(int logical_cpu)
|
|
||||||
{
|
|
||||||
if (logical_cpu >= CONFIG_MAX_CPUS || logical_cpu < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
return cpus[logical_cpu].default_apic_id;
|
|
||||||
}
|
|
||||||
|
|
||||||
void smm_initiate_relocation_parallel(void)
|
void smm_initiate_relocation_parallel(void)
|
||||||
{
|
{
|
||||||
if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) {
|
if ((lapic_read(LAPIC_ICR) & LAPIC_ICR_BUSY)) {
|
||||||
|
@ -769,7 +748,7 @@ static void adjust_smm_apic_id_map(struct smm_loader_params *smm_params)
|
||||||
struct smm_runtime *runtime = smm_params->runtime;
|
struct smm_runtime *runtime = smm_params->runtime;
|
||||||
|
|
||||||
for (i = 0; i < CONFIG_MAX_CPUS; i++)
|
for (i = 0; i < CONFIG_MAX_CPUS; i++)
|
||||||
runtime->apic_id_to_cpu[i] = mp_get_apic_id(i);
|
runtime->apic_id_to_cpu[i] = cpu_get_apic_id(i);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int install_relocation_handler(int num_cpus, size_t save_state_size)
|
static int install_relocation_handler(int num_cpus, size_t save_state_size)
|
||||||
|
|
|
@ -5,6 +5,10 @@
|
||||||
|
|
||||||
#if !defined(__ROMCC__)
|
#if !defined(__ROMCC__)
|
||||||
void cpu_initialize(unsigned int cpu_index);
|
void cpu_initialize(unsigned int cpu_index);
|
||||||
|
/* Returns default APIC id based on logical_cpu number or < 0 on failure. */
|
||||||
|
int cpu_get_apic_id(int logical_cpu);
|
||||||
|
/* Function to keep track of cpu default apic_id */
|
||||||
|
void cpu_add_map_entry(unsigned int index);
|
||||||
struct bus;
|
struct bus;
|
||||||
void initialize_cpus(struct bus *cpu_bus);
|
void initialize_cpus(struct bus *cpu_bus);
|
||||||
asmlinkage void secondary_cpu_init(unsigned int cpu_index);
|
asmlinkage void secondary_cpu_init(unsigned int cpu_index);
|
||||||
|
|
|
@ -145,9 +145,6 @@ int mp_run_on_all_cpus(void (*func)(void *), void *arg, long expire_us);
|
||||||
*/
|
*/
|
||||||
int mp_park_aps(void);
|
int mp_park_aps(void);
|
||||||
|
|
||||||
/* Returns APIC id for coreboot CPU number or < 0 on failure. */
|
|
||||||
int mp_get_apic_id(int logical_cpu);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SMM helpers to use with initializing CPUs.
|
* SMM helpers to use with initializing CPUs.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue