Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acda5430 authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Christoffer Dall
Browse files

ARM: KVM: Support vgic-v3 



This patch allows to build and use vgic-v3 in 32-bit mode.

Unfortunately, it can not be split in several steps without extra
stubs to keep patches independent and bisectable.  For instance,
virt/kvm/arm/vgic/vgic-v3.c uses function from vgic-v3-sr.c, handling
access to GICv3 cpu interface from the guest requires vgic_v3.vgic_sre
to be already defined.

It is how support has been done:

* handle SGI requests from the guest

* report configured SRE on access to GICv3 cpu interface from the guest

* required vgic-v3 macros are provided via uapi.h

* static keys are used to select GIC backend

* to make vgic-v3 build KVM_ARM_VGIC_V3 guard is removed along with
  the static inlines

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent a078bedf

arch/arm/include/asm/kvm_asm.h

+3 −0
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); 
extern void __init_stage2_translation(void);



extern void __kvm_hyp_reset(unsigned long);



extern u64 __vgic_v3_get_ich_vtr_el2(void);

extern void __vgic_v3_init_lrs(void);

#endif



#endif /* __ARM_KVM_ASM_H__ */

arch/arm/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -39,7 +39,12 @@ 


#include <kvm/arm_vgic.h>





#ifdef CONFIG_ARM_GIC_V3

#define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS

#else

#define KVM_MAX_VCPUS VGIC_V2_MAX_CPUS

#endif



#define KVM_REQ_VCPU_EXIT	8

arch/arm/include/asm/kvm_hyp.h

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ void __vgic_v2_restore_state(struct kvm_vcpu *vcpu); 
void __sysreg_save_state(struct kvm_cpu_context *ctxt);

void __sysreg_restore_state(struct kvm_cpu_context *ctxt);



void __vgic_v3_save_state(struct kvm_vcpu *vcpu);

void __vgic_v3_restore_state(struct kvm_vcpu *vcpu);



void asmlinkage __vfp_save_state(struct vfp_hard_struct *vfp);

void asmlinkage __vfp_restore_state(struct vfp_hard_struct *vfp);

static inline bool __vfp_enabled(void)

arch/arm/include/uapi/asm/kvm.h

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,13 @@ struct kvm_regs { 
#define KVM_VGIC_V2_DIST_SIZE		0x1000

#define KVM_VGIC_V2_CPU_SIZE		0x2000



/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)



#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */

#define KVM_ARM_VCPU_PSCI_0_2		1 /* CPU uses PSCI v0.2 */

arch/arm/kvm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ obj-y += $(KVM)/arm/vgic/vgic.o 
obj-y += $(KVM)/arm/vgic/vgic-init.o

obj-y += $(KVM)/arm/vgic/vgic-irqfd.o

obj-y += $(KVM)/arm/vgic/vgic-v2.o

obj-y += $(KVM)/arm/vgic/vgic-v3.o

obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v3.o

obj-y += $(KVM)/arm/vgic/vgic-kvm-device.o

obj-y += $(KVM)/irqchip.o

obj-y += $(KVM)/arm/arch_timer.o