Commit fc3790fa authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-gicv4-for-v4.15' of... 

Merge tag 'kvm-arm-gicv4-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

GICv4 Support for KVM/ARM for v4.15
parents cf9b0772 95b110ab

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,10 @@ 
			[KVM,ARM] Trap guest accesses to GICv3 common

			system registers



	kvm-arm.vgic_v4_enable=

			[KVM,ARM] Allow use of GICv4 for direct injection of

			LPIs.



	kvm-intel.ept=	[KVM,Intel] Disable extended page tables

			(virtualized MMU) support on capable Intel chips.

			Default is 1 (enabled)

Documentation/virtual/kvm/devices/arm-vgic-its.txt

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ Groups: 
    -EINVAL: Inconsistent restored data

    -EFAULT: Invalid guest ram access

    -EBUSY:  One or more VCPUS are running

    -EACCES: The virtual ITS is backed by a physical GICv4 ITS, and the

	     state is not available



  KVM_DEV_ARM_VGIC_GRP_ITS_REGS

  Attributes:

arch/arm/kvm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -23,6 +24,8 @@ config KVM 
	select PREEMPT_NOTIFIERS

	select ANON_INODES

	select ARM_GIC

	select ARM_GIC_V3

	select ARM_GIC_V3_ITS

	select HAVE_KVM_CPU_RELAX_INTERCEPT

	select HAVE_KVM_ARCH_TLB_FLUSH_ALL

	select KVM_MMIO
@@ -36,6 +39,8 @@ config KVM 
	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER

	---help---

	  Support hosting virtualized guest machines.

arch/arm/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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-v4.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

arch/arm64/kvm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -36,6 +37,8 @@ config KVM 
	select HAVE_KVM_MSI

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	---help---

	  Support hosting virtualized guest machines.

	  We don't support KVM with 16K page tables yet, due to the multiple