KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
authorHaibin Wang <wanghaibin.wang@huawei.com>
Tue, 29 Apr 2014 06:49:17 +0000 (14:49 +0800)
committerChristoffer Dall <christoffer.dall@linaro.org>
Tue, 29 Apr 2014 09:01:43 +0000 (02:01 -0700)
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>
virt/kvm/arm/vgic.c

index f9af48c9eb37351b0b13bdc676d6bcad9e45f05e..56ff9bebb577df935200aacfc1e8251ae0800bcc 100644 (file)
@@ -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;
 }