github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-11 13:03:15 +00:00
Code Issues Projects Releases Wiki Activity

hv: refine 'init_percpu_lapic_id'

Browse Source 
This patch refines 'init_percpu_lapic_id' to move the error
handling to 'init_pcpu_pre'.

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
This commit is contained in:
Shiqing Gao 2019-05-10 10:53:01 +08:00 committed by ACRN System Integration
parent dbb41575e7
commit 7b8abe156c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,24 +45,26 @@ static void print_hv_banner(void);
static uint16_t get_pcpu_id_from_lapic_id(uint32_t lapic_id); static uint16_t get_pcpu_id_from_lapic_id(uint32_t lapic_id);
static uint64_t start_tsc __attribute__((__section__(".bss_noinit"))); static uint64_t start_tsc __attribute__((__section__(".bss_noinit")));
static void init_percpu_lapic_id(void) static bool init_percpu_lapic_id(void)
{ {
uint16_t i; uint16_t i;
uint16_t pcpu_num; uint16_t pcpu_num;
uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM]; uint32_t lapic_id_array[CONFIG_MAX_PCPU_NUM];
bool success = false;
/* Save all lapic_id detected via parse_mdt in lapic_id_array */ /* Save all lapic_id detected via parse_mdt in lapic_id_array */
pcpu_num = parse_madt(lapic_id_array); pcpu_num = parse_madt(lapic_id_array);
if (pcpu_num == 0U) {
/* failed to get the physcial cpu number */
panic("failed to get the physcial cpu number");
}
if (pcpu_num != 0U) {
phys_cpu_num = pcpu_num; phys_cpu_num = pcpu_num;
for (i = 0U; (i < pcpu_num) && (i < CONFIG_MAX_PCPU_NUM); i++) { for (i = 0U; (i < pcpu_num) && (i < CONFIG_MAX_PCPU_NUM); i++) {
per_cpu(lapic_id, i) = lapic_id_array[i]; per_cpu(lapic_id, i) = lapic_id_array[i];
} }
success = true;
}
return success;
} }
static void pcpu_set_current_state(uint16_t pcpu_id, enum pcpu_boot_state state) static void pcpu_set_current_state(uint16_t pcpu_id, enum pcpu_boot_state state)
@ -132,7 +134,9 @@ void init_pcpu_pre(uint16_t pcpu_id_args)
early_init_lapic(); early_init_lapic();
init_percpu_lapic_id(); if (!init_percpu_lapic_id()) {
panic("failed to init_percpu_lapic_id!");
}
ret = init_ioapic_id_info(); ret = init_ioapic_id_info();
if (ret != 0) { if (ret != 0) {