github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

uefi: remove old interrupt injection method

Browse Source 
we added uefi stub for hv, and want vm0 continue running under uefi env to
boot other uefi payload (osloader or bzImage).

during this, the uefi timer irq need be handled elegantly.

there are 3 types for uefi timer:
1. 8254 based on IRQ0 of PIC
2. HPET based on IOAPIC
3. HPET based on MSI

currently, we only support type 3 (HPET+MSI). But we are following a
in-correct flow to handle this timer interrupt:
- we set VMX_ENTRY_INT_INFO_FIELD directly if a timer interrupt happened
  before vcpu launching, this will make its vlapic mess up, which finally
  cause hpet timer stop.

this patch remove this in-correct approach, the new approach patch will
be followed by next patch.

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Jason Chen CJ
2018-03-20 00:27:50 +08:00
committed by Jack Ren
parent 23efb5a0e9
commit a87757d602
5 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hypervisor/bsp/uefi/uefi.c
View File

@@ -56,32 +56,12 @@
uint32_t efi_physical_available_ap_bitmap = 0;
uint32_t efi_wake_up_ap_bitmap = 0;
struct efi_ctx* efi_ctx = NULL;
int efi_launch_vector;
extern uint32_t up_count;
extern unsigned long pcpu_sync;
bool in_efi_boot_svc(void)
void efi_spurious_handler(int vector)
{
return (efi_wake_up_ap_bitmap != efi_physical_available_ap_bitmap);
}
int efi_spurious_handler(int vector)
{
struct vcpu* vcpu;
if (get_cpu_id() != 0)
return 0;
vcpu = per_cpu(vcpu, 0);
if (vcpu && vcpu->launched) {
int ret = vlapic_set_intr(vcpu, vector, 0);
if (ret && in_efi_boot_svc())
exec_vmwrite(VMX_ENTRY_INT_INFO_FIELD,
VMX_INT_INFO_VALID | vector);
} else
efi_launch_vector = vector;
return 1;
return;
}
int sipi_from_efi_boot_service_exit(uint32_t dest, uint32_t mode, uint32_t vec)
@@ -155,6 +135,5 @@ void init_bsp(void)
vm_sw_loader = uefi_sw_loader;
spurious_handler = efi_spurious_handler;
efi_launch_vector = -1;
#endif
}