OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: vioapic: refine vioapic_mmio_rw function 

Merge multiple if to switch-case. And set 0xFFFFFFFFU as the default
value of undefined address.

And the IOREGSEL register only bits 7:0 are defined, so mask the other
bits for read operation.

Signed-off-by: Yu Wang <yu1.wang@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Yu Wang 2018-08-01 08:57:48 +00:00 committed by lijinxia
parent f0d2291fe2
commit 771c6db321
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hypervisor/arch/x86/guest/vioapic.c
View File

@ -431,45 +431,46 @@ vioapic_indirect_write(struct vioapic *vioapic, uint32_t addr, uint32_t data)
static void static void
vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa, vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa,
uint32_t *data, bool doread) uint32_t *data, bool do_read)
{ {
uint32_t offset; uint32_t offset;
offset = (uint32_t)(gpa - VIOAPIC_BASE); offset = (uint32_t)(gpa - VIOAPIC_BASE);
/* VIOAPIC_LOCK(vioapic);
* The IOAPIC specification allows 32-bit wide accesses to the
/* The IOAPIC specification allows 32-bit wide accesses to the
* IOAPIC_REGSEL (offset 0) and IOAPIC_WINDOW (offset 16) registers. * IOAPIC_REGSEL (offset 0) and IOAPIC_WINDOW (offset 16) registers.
*/ */
if (offset != IOAPIC_REGSEL && switch (offset) {
offset != IOAPIC_WINDOW && case IOAPIC_REGSEL:
offset != IOAPIC_EOIR) { if (do_read) {
if (doread) {
*data = 0U;
}
}
VIOAPIC_LOCK(vioapic);
if (offset == IOAPIC_REGSEL) {
if (doread) {
*data = vioapic->ioregsel; *data = vioapic->ioregsel;
} else { } else {
vioapic->ioregsel = *data; vioapic->ioregsel = *data & 0xFFU;
} }
} else if (offset == IOAPIC_EOIR) { break;
/* only need to handle write operation */ case IOAPIC_EOIR:
if (!doread) { if (!do_read) {
vioapic_write_eoi(vioapic, *data); vioapic_write_eoi(vioapic, *data);
} }
} else { break;
if (doread) { case IOAPIC_WINDOW:
if (do_read) {
*data = vioapic_indirect_read(vioapic, *data = vioapic_indirect_read(vioapic,
vioapic->ioregsel); vioapic->ioregsel);
} else { } else {
vioapic_indirect_write(vioapic, vioapic->ioregsel, vioapic_indirect_write(vioapic,
*data); vioapic->ioregsel, *data);
} }
break;
default:
if (do_read) {
*data = 0xFFFFFFFFU;
}
break;
} }
VIOAPIC_UNLOCK(vioapic); VIOAPIC_UNLOCK(vioapic);
} }