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

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

Merge tag 'kvm-arm-for-4.10' of... 

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

KVM/ARM updates for 4.10:

- Support for the GICv3 ITS on 32bit platforms
- A handful of timer and GIC emulation fixes
- A PMU architecture fix
parents 36da91bd 21cbe3cc

Documentation/virtual/kvm/api.txt

+1 −1
Original line number Diff line number Diff line
@@ -2201,7 +2201,7 @@ after pausing the vcpu, but before it is resumed. 
4.71 KVM_SIGNAL_MSI



Capability: KVM_CAP_SIGNAL_MSI

Architectures: x86 arm64

Architectures: x86 arm arm64

Type: vm ioctl

Parameters: struct kvm_msi (in)

Returns: >0 on delivery, 0 if guest blocked the MSI, and -1 on error

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

+2 −0
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ struct kvm_regs { 
/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

#define KVM_VGIC_V3_ITS_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/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ config KVM 
	select HAVE_KVM_IRQFD

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	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,5 +32,6 @@ 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)/arm/vgic/vgic-its.o

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

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

arch/arm/kvm/arm.c

+6 −0
Original line number Diff line number Diff line
@@ -221,6 +221,12 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_MAX_VCPUS:

		r = KVM_MAX_VCPUS;

		break;

	case KVM_CAP_MSI_DEVID:

		if (!kvm)

			r = -EINVAL;

		else

			r = kvm->arch.vgic.msis_require_devid;

		break;

	default:

		r = kvm_arch_dev_ioctl_check_extension(kvm, ext);

		break;