Commit 67b2abfe authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm64: KVM: vgic: enable GICv2 emulation on top on GICv3 hardware 



Add the last missing bits that enable GICv2 emulation on top of
GICv3 hardware.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 754d3772

arch/arm64/include/asm/kvm_host.h

+7 −0
Original line number Diff line number Diff line
@@ -216,6 +216,13 @@ static inline void vgic_arch_setup(const struct vgic_params *vgic) 
		__vgic_sr_vectors.restore_vgic	= __restore_vgic_v2_state;

		break;



#ifdef CONFIG_ARM_GIC_V3

	case VGIC_V3:

		__vgic_sr_vectors.save_vgic	= __save_vgic_v3_state;

		__vgic_sr_vectors.restore_vgic	= __restore_vgic_v3_state;

		break;

#endif



	default:

		BUG();

	}

arch/arm64/kvm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -22,4 +22,6 @@ kvm-$(CONFIG_KVM_ARM_HOST) += guest.o reset.o sys_regs.o sys_regs_generic_v8.o 
kvm-$(CONFIG_KVM_ARM_VGIC) += $(KVM)/arm/vgic.o

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

kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v2-switch.o

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

kvm-$(CONFIG_KVM_ARM_VGIC) += vgic-v3-switch.o

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

virt/kvm/arm/vgic.c

+1 −0
Original line number Diff line number Diff line
@@ -1530,6 +1530,7 @@ static struct notifier_block vgic_cpu_nb = { 


static const struct of_device_id vgic_ids[] = {

	{ .compatible = "arm,cortex-a15-gic", .data = vgic_v2_probe, },

	{ .compatible = "arm,gic-v3", .data = vgic_v3_probe, },

	{},

};