aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2015-07-03 12:26:29 +0100
committerWill Deacon <will.deacon@arm.com>2015-07-08 17:39:32 +0100
commit3fc7fe4ff147aa145f8fb8c8bae324ad37f46005 (patch)
treec336376b182980ae26b18006c3291118e89e9dc6
parent50687d873a7d952850591890ac087a3c954167d9 (diff)
downloadkvmtool-3fc7fe4ff147aa145f8fb8c8bae324ad37f46005.tar.gz
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 <marc.zyngier@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--arm/aarch64/include/kvm/kvm-arch.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arm/aarch64/include/kvm/kvm-arch.h b/arm/aarch64/include/kvm/kvm-arch.h
index 2f08a263..4925736d 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 : \