diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2018-04-25 11:09:45 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-05-23 13:21:58 +0100 |
| commit | 9a0069409a54db96e24bd2bb6a39a7ab673fd4be (patch) | |
| tree | 4b745cff4556265e958e4f8e171d7bacadd4c5e1 | |
| parent | a43b08e86842a95391a3d18f734fe36c51236ef5 (diff) | |
| download | kvmtool-9a0069409a54db96e24bd2bb6a39a7ab673fd4be.tar.gz | |
arm/gic: move GICv2M gadget size into private header
The header files in arm/aarch*/include/asm/ are directly copied from
Linux, so we can't just put our own definitions in there.
Move the GICv2M MMIO frame size into a more private header, to avoid
breaking the build once the header files are synced from Linux.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arm/aarch32/include/asm/kvm.h | 2 | ||||
| -rw-r--r-- | arm/aarch64/include/asm/kvm.h | 2 | ||||
| -rw-r--r-- | arm/include/arm-common/gic.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arm/aarch32/include/asm/kvm.h b/arm/aarch32/include/asm/kvm.h index 02206673..6ebd3e6a 100644 --- a/arm/aarch32/include/asm/kvm.h +++ b/arm/aarch32/include/asm/kvm.h @@ -84,8 +84,6 @@ struct kvm_regs { #define KVM_VGIC_V2_DIST_SIZE 0x1000 #define KVM_VGIC_V2_CPU_SIZE 0x2000 -#define KVM_VGIC_V2M_SIZE 0x1000 - /* Supported VGICv3 address types */ #define KVM_VGIC_V3_ADDR_TYPE_DIST 2 #define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 diff --git a/arm/aarch64/include/asm/kvm.h b/arm/aarch64/include/asm/kvm.h index 7d14507b..c2860358 100644 --- a/arm/aarch64/include/asm/kvm.h +++ b/arm/aarch64/include/asm/kvm.h @@ -84,8 +84,6 @@ struct kvm_regs { #define KVM_VGIC_V2_DIST_SIZE 0x1000 #define KVM_VGIC_V2_CPU_SIZE 0x2000 -#define KVM_VGIC_V2M_SIZE 0x1000 - /* Supported VGICv3 address types */ #define KVM_VGIC_V3_ADDR_TYPE_DIST 2 #define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 diff --git a/arm/include/arm-common/gic.h b/arm/include/arm-common/gic.h index 687effc6..ae253c05 100644 --- a/arm/include/arm-common/gic.h +++ b/arm/include/arm-common/gic.h @@ -21,6 +21,8 @@ #define GIC_MAX_CPUS 8 #define GIC_MAX_IRQ 255 +#define KVM_VGIC_V2M_SIZE 0x1000 + enum irqchip_type { IRQCHIP_GICV2, IRQCHIP_GICV2M, |