github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

HV: change param type of init_pcpu_pre

Browse Source 
When initialize secondary pcpu, pass INVALID_CPU_ID as param of init_pcpu_pre()
looks weird, so change the param type to bool to represent whether the pcpu is
a BSP or AP.

Tracked-On: #3420

Signed-off-by: Victor Sun <victor.sun@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Victor Sun 2019-07-17 10:02:56 +08:00 committed by ACRN System Integration
parent e352553e1a
commit 600aa8ea5a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hypervisor/arch/x86/cpu.c
View File

@ -94,12 +94,13 @@ uint64_t get_active_pcpu_bitmap(void)
return pcpu_active_bitmap; return pcpu_active_bitmap;
} }
void init_pcpu_pre(uint16_t pcpu_id_args) void init_pcpu_pre(bool is_bsp)
{ {
uint16_t pcpu_id = pcpu_id_args; uint16_t pcpu_id;
int32_t ret; int32_t ret;
if (pcpu_id == BOOT_CPU_ID) { if (is_bsp) {
pcpu_id = BOOT_CPU_ID;
start_tsc = rdtsc(); start_tsc = rdtsc();
/* Clear BSS */ /* Clear BSS */

4
hypervisor/arch/x86/init.c
View File

@ -82,7 +82,7 @@ void init_primary_pcpu(void)
{ {
uint64_t rsp; uint64_t rsp;
init_pcpu_pre(BOOT_CPU_ID); init_pcpu_pre(true);
/* Switch to run-time stack */ /* Switch to run-time stack */
rsp = (uint64_t)(&get_cpu_var(stack)[CONFIG_STACK_SIZE - 1]); rsp = (uint64_t)(&get_cpu_var(stack)[CONFIG_STACK_SIZE - 1]);
@ -94,7 +94,7 @@ void init_secondary_pcpu(void)
{ {
uint16_t pcpu_id; uint16_t pcpu_id;
init_pcpu_pre(INVALID_CPU_ID); init_pcpu_pre(false);
pcpu_id = get_pcpu_id(); pcpu_id = get_pcpu_id();

2
hypervisor/include/arch/x86/cpu.h
View File

@ -265,7 +265,7 @@ void cpu_do_idle(void);
void cpu_dead(void); void cpu_dead(void);
void trampoline_start16(void); void trampoline_start16(void);
void load_pcpu_state_data(void); void load_pcpu_state_data(void);
void init_pcpu_pre(uint16_t pcpu_id_args); void init_pcpu_pre(bool is_bsp);
void init_pcpu_post(uint16_t pcpu_id); void init_pcpu_post(uint16_t pcpu_id);
bool start_pcpus(uint64_t mask); bool start_pcpus(uint64_t mask);
void wait_pcpus_offline(uint64_t mask); void wait_pcpus_offline(uint64_t mask);