Commit 30c21170 authored Apr 29, 2014 by Haibin Wang Committed by Christoffer Dall Apr 29, 2014

KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.



Currently below check in vgic_ioaddr_overlap will always succeed,
because the vgic dist base and vgic cpu base are still kept UNDEF
after initialization. The code as follows will be return forever.

	if (IS_VGIC_ADDR_UNDEF(dist) || IS_VGIC_ADDR_UNDEF(cpu))
                return 0;

So, before invoking the vgic_ioaddr_overlap, it needs to set the
corresponding base address firstly.

Signed-off-by: Haibin Wang <wanghaibin.wang@huawei.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

parent f2ae85b2

virt/kvm/arm/vgic.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1667,10 +1667,11 @@ static int vgic_ioaddr_assign(struct kvm kvm, phys_addr_t ioaddr,
		if (addr + size < addr)
		return -EINVAL;

		*ioaddr = addr;
		ret = vgic_ioaddr_overlap(kvm);
		if (ret)
		return ret;
		*ioaddr = addr;
		*ioaddr = VGIC_ADDR_UNDEF;

		return ret;
		}

Admin message