github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 11:07:51 +00:00
Code Issues Projects Releases Wiki Activity

hv: vlapic_timer: add vlapic timer mode API

Browse Source 
Add vlapic_lvtt_oneshot, vlapic_lvtt_masked
rename vlapic_periodic_timer to vlapic_lvtt_period
rename VLAPIC_TSCDEADLINE to vlapic_lvtt_tsc_deadline

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Li, Fei1 2018-05-03 14:17:53 +08:00 committed by Jack Ren
parent 8ec78f8efc
commit ea54216116
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,6 @@ do { \
#define VLAPIC_CTR_ISR(vlapic, msg) #define VLAPIC_CTR_ISR(vlapic, msg)
#endif #endif
/* TIMER_LVT bit[18:17] == 0x10 TSD DEADLINE mode */
#define VLAPIC_TSCDEADLINE(lvt) (((lvt) & APIC_LVTT_TM) == APIC_LVTT_TM_TSCDLT)
/*APIC-v APIC-access address */ /*APIC-v APIC-access address */
static void *apicv_apic_access_addr; static void *apicv_apic_access_addr;
@ -231,6 +228,33 @@ vlapic_id_write_handler(struct vlapic *vlapic)
lapic->id = vlapic_get_id(vlapic); lapic->id = vlapic_get_id(vlapic);
} }
static inline bool
vlapic_lvtt_oneshot(struct vlapic *vlapic)
{
return ((vlapic->apic_page->lvt_timer & APIC_LVTT_TM)
== APIC_LVTT_TM_ONE_SHOT);
}
static inline bool
vlapic_lvtt_period(struct vlapic *vlapic)
{
return ((vlapic->apic_page->lvt_timer & APIC_LVTT_TM)
== APIC_LVTT_TM_PERIODIC);
}
static inline bool
vlapic_lvtt_tsc_deadline(struct vlapic *vlapic)
{
return ((vlapic->apic_page->lvt_timer & APIC_LVTT_TM)
== APIC_LVTT_TM_TSCDLT);
}
static inline bool
vlapic_lvtt_masked(struct vlapic *vlapic)
{
return !!(vlapic->apic_page->lvt_timer & APIC_LVTT_M);
}
static uint32_t vlapic_get_ccr(__unused struct vlapic *vlapic) static uint32_t vlapic_get_ccr(__unused struct vlapic *vlapic)
{ {
return 0; return 0;
@ -608,23 +632,6 @@ vlapic_process_eoi(struct vlapic *vlapic)
dev_dbg(ACRN_DBG_LAPIC, "Gratuitous EOI"); dev_dbg(ACRN_DBG_LAPIC, "Gratuitous EOI");
} }
static inline int
vlapic_get_lvt_field(uint32_t lvt, uint32_t mask)
{
return lvt & mask;
}
static inline int
vlapic_periodic_timer(struct vlapic *vlapic)
{
uint32_t lvt;
lvt = vlapic_get_lvt(vlapic, APIC_OFFSET_TIMER_LVT);
return vlapic_get_lvt_field(lvt, APIC_LVTT_TM_PERIODIC);
}
static void static void
vlapic_set_error(struct vlapic *vlapic, uint32_t mask) vlapic_set_error(struct vlapic *vlapic, uint32_t mask)
{ {
@ -1087,7 +1094,7 @@ vlapic_svr_write_handler(struct vlapic *vlapic)
* if it is configured in periodic mode. * if it is configured in periodic mode.
*/ */
dev_dbg(ACRN_DBG_LAPIC, "vlapic is software-enabled"); dev_dbg(ACRN_DBG_LAPIC, "vlapic is software-enabled");
if (vlapic_periodic_timer(vlapic)) if (vlapic_lvtt_period(vlapic))
vlapic_icrtmr_write_handler(vlapic); vlapic_icrtmr_write_handler(vlapic);
} }
} }
@ -1178,7 +1185,7 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
break; break;
case APIC_OFFSET_TIMER_ICR: case APIC_OFFSET_TIMER_ICR:
/* if TSCDEADLINE mode always return 0*/ /* if TSCDEADLINE mode always return 0*/
if (VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (vlapic_lvtt_tsc_deadline(vlapic))
*data = 0; *data = 0;
else else
*data = vlapic_get_ccr(vlapic); *data = vlapic_get_ccr(vlapic);
@ -1273,7 +1280,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
break; break;
case APIC_OFFSET_TIMER_ICR: case APIC_OFFSET_TIMER_ICR:
/* if TSCDEADLINE mode ignore icr_timer */ /* if TSCDEADLINE mode ignore icr_timer */
if (VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (vlapic_lvtt_tsc_deadline(vlapic))
break; break;
lapic->icr_timer = data; lapic->icr_timer = data;
vlapic_icrtmr_write_handler(vlapic); vlapic_icrtmr_write_handler(vlapic);
@ -1657,8 +1664,8 @@ static int tsc_periodic_time(void *data)
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
lapic = vlapic->apic_page; lapic = vlapic->apic_page;
/* inject vcpu timer interrupt if existing */ /* inject vcpu timer interrupt if not masked */
if (VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (!vlapic_lvtt_masked(vlapic))
vlapic_intr_edge(vcpu, lapic->lvt_timer & APIC_LVTT_VECTOR); vlapic_intr_edge(vcpu, lapic->lvt_timer & APIC_LVTT_VECTOR);
return 0; return 0;
@ -1694,10 +1701,8 @@ vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val)
int error; int error;
uint32_t offset; uint32_t offset;
struct vlapic *vlapic; struct vlapic *vlapic;
struct lapic *lapic;
vlapic = vcpu->arch_vcpu.vlapic; vlapic = vcpu->arch_vcpu.vlapic;
lapic = vlapic->apic_page;
switch (msr) { switch (msr) {
case MSR_IA32_APIC_BASE: case MSR_IA32_APIC_BASE:
@ -1706,7 +1711,7 @@ vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val)
case MSR_IA32_TSC_DEADLINE: case MSR_IA32_TSC_DEADLINE:
error = 0; error = 0;
if (!VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (!vlapic_lvtt_tsc_deadline(vlapic))
return error; return error;
del_timer(&vlapic->timer); del_timer(&vlapic->timer);