Revert "hv: x2apic support for acrn"

This reverts commit 348e2ba.

Author: JasonChenCJ

hypervisor/arch/x86/cpu.c

@@ -54,7 +54,7 @@ static void cpu_cap_detect(void);
 static void cpu_xsave_init(void);
 static void set_current_cpu_id(uint16_t pcpu_id);
 static void print_hv_banner(void);
-static uint16_t get_cpu_id_from_lapic_id(uint32_t lapic_id);
+static uint16_t get_cpu_id_from_lapic_id(uint8_t lapic_id);
 int ibrs_type;
 static uint64_t start_tsc __attribute__((__section__(".bss_noinit")));
 
@@ -276,9 +276,9 @@ static void alloc_phy_cpu_data(uint16_t pcpu_num)
 	ASSERT(per_cpu_data_base_ptr != NULL, "");
 }
 
-uint16_t __attribute__((weak)) parse_madt(uint32_t lapic_id_array[MAX_PCPU_NUM])
+uint16_t __attribute__((weak)) parse_madt(uint8_t lapic_id_array[MAX_PCPU_NUM])
 {
-	static const uint32_t lapic_id[] = {0U, 2U, 4U, 6U};
+	static const uint8_t lapic_id[] = {0U, 2U, 4U, 6U};
 	uint32_t i;
 
 	for (i = 0U; i < ARRAY_SIZE(lapic_id); i++) {
@@ -292,7 +292,7 @@ static void init_percpu_data_area(void)
 {
 	uint16_t i;
 	uint16_t pcpu_num = 0U;
-	uint32_t lapic_id_array[MAX_PCPU_NUM];
+	uint8_t lapic_id_array[MAX_PCPU_NUM];
 
 	/* Save all lapic_id detected via parse_mdt in lapic_id_array */
 	pcpu_num = parse_madt(lapic_id_array);
@@ -306,6 +306,9 @@ static void init_percpu_data_area(void)
 	for (i = 0U; i < pcpu_num; i++) {
 		per_cpu(lapic_id, i) = lapic_id_array[i];
 	}
+
+	ASSERT(get_cpu_id_from_lapic_id(get_cur_lapic_id()) != INVALID_CPU_ID,
+		"fail to get phy cpu id");
 }
 
 static void cpu_set_current_state(uint16_t pcpu_id, enum pcpu_boot_state state)
@@ -403,10 +406,6 @@ void bsp_boot_init(void)
 	/* Initialize the hypervisor paging */
 	init_paging();
 
-	if (!cpu_has_cap(X86_FEATURE_X2APIC)) {
-		panic("x2APIC is not present!");
-	}
-
 	early_init_lapic();
 
 	init_percpu_data_area();
@@ -582,7 +581,7 @@ static void cpu_secondary_post(void)
 	cpu_dead(get_cpu_id());
 }
 
-static uint16_t get_cpu_id_from_lapic_id(uint32_t lapic_id)
+static uint16_t get_cpu_id_from_lapic_id(uint8_t lapic_id)
 {
 	uint16_t i;
 

hypervisor/arch/x86/guest/vmsr.c

@@ -14,10 +14,10 @@ static const uint32_t emulated_msrs[] = {
 	MSR_IA32_BIOS_SIGN_ID, /* Enable MSR_IA32_BIOS_SIGN_ID */
 	MSR_IA32_TIME_STAMP_COUNTER,
 	MSR_IA32_PAT,
-	MSR_IA32_APIC_BASE,
 
 /* following MSR not emulated now */
 /*
+ *	MSR_IA32_APIC_BASE,
  *	MSR_IA32_SYSENTER_CS,
  *	MSR_IA32_SYSENTER_ESP,
  *	MSR_IA32_SYSENTER_EIP,

hypervisor/arch/x86/irq.c

@@ -484,7 +484,7 @@ void interrupt_init(uint16_t pcpu_id)
 	struct host_idt_descriptor *idtd = &HOST_IDTR;
 
 	set_idt(idtd);
-	init_lapic();
+	init_lapic(pcpu_id);
 	init_default_irqs(pcpu_id);
 #ifndef CONFIG_EFI_STUB
 	CPU_IRQ_ENABLE();