From 3fc7fe4ff147aa145f8fb8c8bae324ad37f46005 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Fri, 3 Jul 2015 12:26:29 +0100 Subject: [PATCH] AArch64: Reserve two 64k pages for GIC CPU interface On AArch64 system with a GICv2, the GICC range can be aligned to the last 4k block of a 64k page, ending up straddling two 64k pages. In order not to conflict with the distributor mapping, allocate two 64k pages to the CPU interface. Signed-off-by: Marc Zyngier Signed-off-by: Andre Przywara Signed-off-by: Will Deacon --- arm/aarch64/include/kvm/kvm-arch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/aarch64/include/kvm/kvm-arch.h b/arm/aarch64/include/kvm/kvm-arch.h index 2f08a26..4925736 100644 --- a/arm/aarch64/include/kvm/kvm-arch.h +++ b/arm/aarch64/include/kvm/kvm-arch.h @@ -2,7 +2,7 @@ #define KVM__KVM_ARCH_H #define ARM_GIC_DIST_SIZE 0x10000 -#define ARM_GIC_CPUI_SIZE 0x10000 +#define ARM_GIC_CPUI_SIZE 0x20000 #define ARM_KERN_OFFSET(kvm) ((kvm)->cfg.arch.aarch32_guest ? \ 0x8000 : \