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: vlapic: move LVT IRQ vector check to vlapic_fire_lvt

Browse Source 
We could simple the vector check for LVT IRQ by move this check to
vlapic_fire_lvt when the IRQ is fixed mode.

Tracked-On: #1842
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2019-03-04 23:54:14 +08:00 committed by wenlingz
parent 473d31c073
commit ca3d4fca55
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/guest/vlapic.c
View File

@ -793,9 +793,7 @@ vlapic_fire_lvt(struct acrn_vlapic *vlapic, uint32_t lvt)
switch (mode) { switch (mode) {
case APIC_LVT_DM_FIXED: case APIC_LVT_DM_FIXED:
if (vlapic_accept_intr(vlapic, vec, LAPIC_TRIG_EDGE)) { vlapic_set_intr(vcpu, vec, LAPIC_TRIG_EDGE);
vcpu_make_request(vcpu, ACRN_REQUEST_EVENT);
}
break; break;
case APIC_LVT_DM_NMI: case APIC_LVT_DM_NMI:
vcpu_inject_nmi(vcpu); vcpu_inject_nmi(vcpu);
@ -969,7 +967,7 @@ vlapic_set_error(struct acrn_vlapic *vlapic, uint32_t mask)
static int32_t static int32_t
vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t lvt_index) vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t lvt_index)
{ {
uint32_t lvt, vec, mode; uint32_t lvt;
int32_t ret = 0; int32_t ret = 0;
struct acrn_vcpu *vcpu = vlapic->vcpu; struct acrn_vcpu *vcpu = vlapic->vcpu;
@ -1027,13 +1025,7 @@ vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t lvt_index)
} }
if (ret == 0) { if (ret == 0) {
vec = lvt & APIC_LVT_VECTOR; vlapic_fire_lvt(vlapic, lvt);
mode = lvt & APIC_LVT_DM;
if ((mode == APIC_LVT_DM_FIXED) && (vec < 16U)) {
vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR);
} else {
vlapic_fire_lvt(vlapic, lvt);
}
} }
} }
return ret; return ret;