github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

hv: vlapic: coding refine

Browse Source 
Using __func__ instead of function string name.
Using tab instead of more whitespace.
Using macro instead of numeric constants.
Remove unnecessary function declaration.

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 10:47:31 +08:00 committed by Jack Ren
parent b9971c206f
commit 8ec78f8efc
2 changed files with 35 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,18 +86,11 @@ do { \
#endif #endif
/* TIMER_LVT bit[18:17] == 0x10 TSD DEADLINE mode */ /* TIMER_LVT bit[18:17] == 0x10 TSD DEADLINE mode */
#define VLAPIC_TSCDEADLINE(lvt) (((lvt) & 0x60000) == 0x40000) #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;
static int
vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t data);
static int
vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
uint64_t *data);
static int static int
apicv_set_intr_ready(struct vlapic *vlapic, int vector, bool level); apicv_set_intr_ready(struct vlapic *vlapic, int vector, bool level);
@ -110,22 +103,12 @@ apicv_set_tmr(struct vlapic *vlapic, int vector, bool level);
static void static void
apicv_batch_set_tmr(struct vlapic *vlapic); apicv_batch_set_tmr(struct vlapic *vlapic);
/*
* Returns 1 if the vcpu needs to be notified of the interrupt and 0 otherwise.
*/
static int
vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level);
/* /*
* Post an interrupt to the vcpu running on 'hostcpu'. This will use a * Post an interrupt to the vcpu running on 'hostcpu'. This will use a
* hardware assist if available (e.g. Posted Interrupt) or fall back to * hardware assist if available (e.g. Posted Interrupt) or fall back to
* sending an 'ipinum' to interrupt the 'hostcpu'. * sending an 'ipinum' to interrupt the 'hostcpu'.
*/ */
static void vlapic_set_error(struct vlapic *vlapic, uint32_t mask); static void vlapic_set_error(struct vlapic *vlapic, uint32_t mask);
static int vlapic_trigger_lvt(struct vlapic *vlapic, int vector);
static uint64_t vlapic_get_apicbase(struct vlapic *vlapic);
static int vlapic_set_apicbase(struct vlapic *vlapic, uint64_t val);
static struct vlapic * static struct vlapic *
vm_lapic_from_vcpu_id(struct vm *vm, int vcpu_id) vm_lapic_from_vcpu_id(struct vm *vm, int vcpu_id)
@ -159,7 +142,7 @@ static int vm_apicid2vcpu_id(struct vm *vm, uint8_t lapicid)
return vcpu->vcpu_id; return vcpu->vcpu_id;
} }
pr_err("vm_apicid2vcpu_id: bad lapicid %d", lapicid); pr_err("%s: bad lapicid %d", __func__, lapicid);
return phy_cpu_num; return phy_cpu_num;
} }
@ -267,6 +250,9 @@ vlapic_esr_write_handler(struct vlapic *vlapic)
vlapic->esr_pending = 0; vlapic->esr_pending = 0;
} }
/*
* Returns 1 if the vcpu needs to be notified of the interrupt and 0 otherwise.
*/
static int static int
vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level) vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level)
{ {
@ -289,8 +275,7 @@ vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level)
if (vector < 16) { if (vector < 16) {
vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR); vlapic_set_error(vlapic, APIC_ESR_RECEIVE_ILLEGAL_VECTOR);
dev_dbg(ACRN_DBG_LAPIC, dev_dbg(ACRN_DBG_LAPIC,
"vlapic ignoring interrupt to vector %d", "vlapic ignoring interrupt to vector %d", vector);
vector);
return 1; return 1;
} }
@ -368,8 +353,8 @@ lvt_off_to_idx(uint32_t offset)
break; break;
} }
ASSERT(index >= 0 && index <= VLAPIC_MAXLVT_INDEX, ASSERT(index >= 0 && index <= VLAPIC_MAXLVT_INDEX,
"lvt_off_to_idx: invalid lvt index %d for offset %#x", "%s: invalid lvt index %d for offset %#x",
index, offset); __func__, index, offset);
return index; return index;
} }
@ -587,7 +572,7 @@ vlapic_update_ppr(struct vlapic *vlapic)
ppr = isrvec & 0xf0; ppr = isrvec & 0xf0;
vlapic->apic_page->ppr = ppr; vlapic->apic_page->ppr = ppr;
dev_dbg(ACRN_DBG_LAPIC, "vlapic_update_ppr 0x%02x", ppr); dev_dbg(ACRN_DBG_LAPIC, "%s 0x%02x", __func__, ppr);
} }
static void static void
@ -1231,7 +1216,7 @@ vlapic_write(struct vlapic *vlapic, int mmio_access, uint64_t offset,
int retval; int retval;
ASSERT((offset & 0xf) == 0 && offset < CPU_PAGE_SIZE, ASSERT((offset & 0xf) == 0 && offset < CPU_PAGE_SIZE,
"vlapic_write: invalid offset %#lx", offset); "%s: invalid offset %#lx", __func__, offset);
dev_dbg(ACRN_DBG_LAPIC, "vlapic write offset %#lx, data %#lx", dev_dbg(ACRN_DBG_LAPIC, "vlapic write offset %#lx, data %#lx",
offset, data); offset, data);
@ -1351,12 +1336,12 @@ vlapic_reset(struct vlapic *vlapic)
void void
vlapic_init(struct vlapic *vlapic) vlapic_init(struct vlapic *vlapic)
{ {
ASSERT(vlapic->vm != NULL, "vlapic_init: vm is not initialized"); ASSERT(vlapic->vm != NULL, "%s: vm is not initialized", __func__);
ASSERT(vlapic->vcpu->vcpu_id >= 0 && ASSERT(vlapic->vcpu->vcpu_id >= 0 &&
vlapic->vcpu->vcpu_id < phy_cpu_num, vlapic->vcpu->vcpu_id < phy_cpu_num,
"vlapic_init: vcpu_id is not initialized"); "%s: vcpu_id is not initialized", __func__);
ASSERT(vlapic->apic_page != NULL, ASSERT(vlapic->apic_page != NULL,
"vlapic_init: apic_page is not initialized"); "%s: apic_page is not initialized", __func__);
/* /*
* If the vlapic is configured in x2apic mode then it will be * If the vlapic is configured in x2apic mode then it will be
@ -1462,8 +1447,8 @@ vlapic_enabled(struct vlapic *vlapic)
{ {
struct lapic *lapic = vlapic->apic_page; struct lapic *lapic = vlapic->apic_page;
if ((vlapic->msr_apicbase & APICBASE_ENABLED) != 0 && if ((vlapic->msr_apicbase & APICBASE_ENABLED) &&
(lapic->svr & APIC_SVR_ENABLE) != 0) (lapic->svr & APIC_SVR_ENABLE))
return true; return true;
else else
return false; return false;
@ -1674,7 +1659,7 @@ static int tsc_periodic_time(void *data)
/* inject vcpu timer interrupt if existing */ /* inject vcpu timer interrupt if existing */
if (VLAPIC_TSCDEADLINE(lapic->lvt_timer)) if (VLAPIC_TSCDEADLINE(lapic->lvt_timer))
vlapic_intr_edge(vcpu, lapic->lvt_timer & 0xFF); vlapic_intr_edge(vcpu, lapic->lvt_timer & APIC_LVTT_VECTOR);
return 0; return 0;
} }