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

Commit efffe55a authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic-new: enable build 



Now that the new VGIC implementation has reached feature parity with
the old one, add the new files to the build system and add a Kconfig
option to switch between the two versions.
We set the default to the new version to get maximum test coverage,
in case people experience problems they can switch back to the old
behaviour if needed.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 568e8c90

arch/arm/kvm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -46,6 +46,13 @@ config KVM_ARM_HOST 
	---help---

	  Provides host support for ARM processors.



config KVM_NEW_VGIC

	bool "New VGIC implementation"

	depends on KVM

	default y

	---help---

	  uses the new VGIC implementation



source drivers/vhost/Kconfig



endif # VIRTUALIZATION

arch/arm/kvm/Makefile

+11 −0
Original line number Diff line number Diff line
@@ -21,7 +21,18 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/ 
obj-y += kvm-arm.o init.o interrupts.o

obj-y += arm.o handle_exit.o guest.o mmu.o emulate.o reset.o

obj-y += coproc.o coproc_a15.o coproc_a7.o mmio.o psci.o perf.o



ifeq ($(CONFIG_KVM_NEW_VGIC),y)

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-mmio.o

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

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

else

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

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

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

endif

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

arch/arm64/kvm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -54,6 +54,13 @@ config KVM_ARM_PMU 
	  Adds support for a virtual Performance Monitoring Unit (PMU) in

	  virtual machines.



config KVM_NEW_VGIC

	bool "New VGIC implementation"

	depends on KVM

	default y

        ---help---

          uses the new VGIC implementation



source drivers/vhost/Kconfig



endif # VIRTUALIZATION

arch/arm64/kvm/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -20,10 +20,22 @@ kvm-$(CONFIG_KVM_ARM_HOST) += emulate.o inject_fault.o regmap.o 
kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o

kvm-$(CONFIG_KVM_ARM_HOST) += guest.o debug.o reset.o sys_regs.o sys_regs_generic_v8.o



ifeq ($(CONFIG_KVM_NEW_VGIC),y)

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-irqfd.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v2.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v3.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o

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

else

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic-v2.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic-v2-emul.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic-v3.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic-v3-emul.o

endif

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o

kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o

virt/kvm/arm/hyp/vgic-v2-sr.c

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


#include <asm/kvm_hyp.h>



#ifdef CONFIG_KVM_NEW_VGIC

extern struct vgic_global kvm_vgic_global_state;

#define vgic_v2_params kvm_vgic_global_state

#else

extern struct vgic_params vgic_v2_params;

#endif



static void __hyp_text save_maint_int_state(struct kvm_vcpu *vcpu,

					    void __iomem *base)