iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: arm-vgic: Make vgic mmio functions more generic

Browse Source 
Rename the vgic_ranges array to vgic_dist_ranges to be more specific and
to prepare for handling CPU interface register access as well (for
save/restore of VGIC state).

Pass offset from distributor or interface MMIO base to
find_matching_range function instead of the physical address of the
access in the VM memory map.  This allows other callers unaware of the
VM specifics, but with generic VGIC knowledge to reuse the function.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
This commit is contained in:
Christoffer Dall 2013-09-23 14:55:56 -07:00
parent 0307e1770f
commit 1006e8cb22
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virt/kvm/arm/vgic.c
View File

@ -602,7 +602,7 @@ struct mmio_range {
phys_addr_t offset); phys_addr_t offset);
}; };
static const struct mmio_range vgic_ranges[] = { static const struct mmio_range vgic_dist_ranges[] = {
{ {
.base = GIC_DIST_CTRL, .base = GIC_DIST_CTRL,
.len = 12, .len = 12,
@ -669,14 +669,13 @@ static const struct mmio_range vgic_ranges[] = {
static const static const
struct mmio_range *find_matching_range(const struct mmio_range *ranges, struct mmio_range *find_matching_range(const struct mmio_range *ranges,
struct kvm_exit_mmio *mmio, struct kvm_exit_mmio *mmio,
phys_addr_t base) phys_addr_t offset)
{ {
const struct mmio_range *r = ranges; const struct mmio_range *r = ranges;
phys_addr_t addr = mmio->phys_addr - base;
while (r->len) { while (r->len) {
if (addr >= r->base && if (offset >= r->base &&
(addr + mmio->len) <= (r->base + r->len)) (offset + mmio->len) <= (r->base + r->len))
return r; return r;
r++; r++;
} }
@ -713,7 +712,8 @@ bool vgic_handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *run,
return true; return true;
} }
range = find_matching_range(vgic_ranges, mmio, base); offset = mmio->phys_addr - base;
range = find_matching_range(vgic_dist_ranges, mmio, offset);
if (unlikely(!range || !range->handle_mmio)) { if (unlikely(!range || !range->handle_mmio)) {
pr_warn("Unhandled access %d %08llx %d\n", pr_warn("Unhandled access %d %08llx %d\n",
mmio->is_write, mmio->phys_addr, mmio->len); mmio->is_write, mmio->phys_addr, mmio->len);