hv: x2apic support for acrn

All the platforms supported by ACRN supports x2APIC. So enabled
x2APIC for ACRN hv. Removed any code that is needed for xAPIC mode
of operation.

Tracked-On: #1455
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Reviewed-by: Eddie Dong <eddie.dong@intel.com>
Reviewed by:  Yonghua Huang <yonghua.huang@intel.com>

Author: Sainath Grandhi

hypervisor/arch/x86/assign.c

@@ -53,10 +53,25 @@ static bool ptdev_hv_owned_intx(const struct vm *vm, union source_id *virt_sid)
 	}
 }
 
+static uint64_t calculate_logical_dest_mask(uint64_t pdmask)
+{
+	uint64_t dest_mask = 0UL;
+	uint64_t pcpu_mask = pdmask;
+	uint16_t pcpu_id;
+
+	pcpu_id = ffs64(pcpu_mask);
+	while (pcpu_id != INVALID_BIT_INDEX) {
+		bitmap_clear_nolock(pcpu_id, &pcpu_mask);
+		dest_mask |= per_cpu(lapic_ldr, pcpu_id);
+		pcpu_id = ffs64(pcpu_mask);
+	}
+	return dest_mask;
+}
+
 static void ptdev_build_physical_msi(struct vm *vm, struct ptdev_msi_info *info,
 		uint32_t vector)
 {
-	uint64_t vdmask, pdmask;
+	uint64_t vdmask, pdmask, dest_mask;
 	uint32_t dest, delmode;
 	bool phys;
 
@@ -78,10 +93,11 @@ static void ptdev_build_physical_msi(struct vm *vm, struct ptdev_msi_info *info,
 	info->pmsi_data &= ~0x7FFU;
 	info->pmsi_data |= delmode | vector;
 
+	dest_mask = calculate_logical_dest_mask(pdmask);
 	/* update physical dest mode & dest field */
 	info->pmsi_addr = info->vmsi_addr;
 	info->pmsi_addr &= ~0xFF00CU;
-	info->pmsi_addr |= (uint32_t)(pdmask << 12U) |
+	info->pmsi_addr |= (uint32_t)(dest_mask << 12U) |
 				MSI_ADDR_RH | MSI_ADDR_LOG;
 
 	dev_dbg(ACRN_DBG_IRQ, "MSI addr:data = 0x%x:%x(V) -> 0x%x:%x(P)",
@@ -99,7 +115,7 @@ ptdev_build_physical_rte(struct vm *vm,
 	union source_id *virt_sid = &entry->virt_sid;
 
 	if (virt_sid->intx_id.src == PTDEV_VPIN_IOAPIC) {
-		uint64_t vdmask, pdmask, delmode;
+		uint64_t vdmask, pdmask, delmode, dest_mask;
 		uint32_t dest;
 		union ioapic_rte virt_rte;
 		bool phys;
@@ -142,9 +158,10 @@ ptdev_build_physical_rte(struct vm *vm,
 			IOAPIC_RTE_DELMOD | IOAPIC_RTE_INTVEC);
 		rte.full |= IOAPIC_RTE_DESTLOG | delmode | (uint64_t)vector;
 
+		dest_mask = calculate_logical_dest_mask(pdmask);
 		/* update physical dest field */
 		rte.full &= ~IOAPIC_RTE_DEST_MASK;
-		rte.full |= pdmask << IOAPIC_RTE_DEST_SHIFT;
+		rte.full |= dest_mask << IOAPIC_RTE_DEST_SHIFT;
 
 		dev_dbg(ACRN_DBG_IRQ, "IOAPIC RTE = 0x%x:%x(V) -> 0x%x:%x(P)",
 			virt_rte.u.hi_32, virt_rte.u.lo_32,

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(uint8_t lapic_id);
+static uint16_t get_cpu_id_from_lapic_id(uint32_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(uint8_t lapic_id_array[MAX_PCPU_NUM])
+uint16_t __attribute__((weak)) parse_madt(uint32_t lapic_id_array[MAX_PCPU_NUM])
 {
-	static const uint8_t lapic_id[] = {0U, 2U, 4U, 6U};
+	static const uint32_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;
-	uint8_t lapic_id_array[MAX_PCPU_NUM];
+	uint32_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,9 +306,6 @@ 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)
@@ -406,6 +403,10 @@ 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();
@@ -581,7 +582,7 @@ static void cpu_secondary_post(void)
 	cpu_dead(get_cpu_id());
 }
 
-static uint16_t get_cpu_id_from_lapic_id(uint8_t lapic_id)
+static uint16_t get_cpu_id_from_lapic_id(uint32_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,