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

Commit 2fa462f8 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4.1-take2' of... 

Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM changes for v4.1, take #2:

Rather small this time:

- a fix for a nasty bug with virtual IRQ injection
- a fix for irqfd
parents 123857a7 fd1d0ddf

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

+7 −1
Original line number Diff line number Diff line
@@ -195,8 +195,14 @@ struct kvm_arch_memory_slot { 
#define KVM_ARM_IRQ_CPU_IRQ		0

#define KVM_ARM_IRQ_CPU_FIQ		1



/* Highest supported SPI, from VGIC_NR_IRQS */

/*

 * This used to hold the highest supported SPI, but it is now obsolete

 * and only here to provide source code level compatibility with older

 * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.

 */

#ifndef __KERNEL__

#define KVM_ARM_IRQ_GIC_MAX		127

#endif



/* One single KVM irqchip, ie. the VGIC */

#define KVM_NR_IRQCHIPS          1

arch/arm/kvm/arm.c

+1 −2
Original line number Diff line number Diff line
@@ -671,8 +671,7 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, 
		if (!irqchip_in_kernel(kvm))

			return -ENXIO;



		if (irq_num < VGIC_NR_PRIVATE_IRQS ||

		    irq_num > KVM_ARM_IRQ_GIC_MAX)

		if (irq_num < VGIC_NR_PRIVATE_IRQS)

			return -EINVAL;



		return kvm_vgic_inject_irq(kvm, 0, irq_num, level);

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

+7 −1
Original line number Diff line number Diff line
@@ -188,8 +188,14 @@ struct kvm_arch_memory_slot { 
#define KVM_ARM_IRQ_CPU_IRQ		0

#define KVM_ARM_IRQ_CPU_FIQ		1



/* Highest supported SPI, from VGIC_NR_IRQS */

/*

 * This used to hold the highest supported SPI, but it is now obsolete

 * and only here to provide source code level compatibility with older

 * userland. The highest SPI number can be set via KVM_DEV_ARM_VGIC_GRP_NR_IRQS.

 */

#ifndef __KERNEL__

#define KVM_ARM_IRQ_GIC_MAX		127

#endif



/* One single KVM irqchip, ie. the VGIC */

#define KVM_NR_IRQCHIPS          1

virt/kvm/arm/vgic.c

+4 −1
Original line number Diff line number Diff line
@@ -1561,6 +1561,9 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, 
			goto out;

	}



	if (irq_num >= kvm->arch.vgic.nr_irqs)

		return -EINVAL;



	vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level);

	if (vcpu_id >= 0) {

		/* kick the specified vcpu */
@@ -2141,7 +2144,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, 
		    struct kvm_kernel_irq_routing_entry *entries,

		    int gsi)

{

	return gsi;

	return 0;

}



int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin)