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

Commit ce01e4e8 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm-vgic: Set base addr through device API 



Support setting the distributor and cpu interface base addresses in the
VM physical address space through the KVM_{SET,GET}_DEVICE_ATTR API
in addition to the ARM specific API.

This has the added benefit of being able to share more code in user
space and do things in a uniform manner.

Also deprecate the older API at the same time, but backwards
compatibility will be maintained.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 7330672b

Documentation/virtual/kvm/api.txt

+6 −1
Original line number Diff line number Diff line
@@ -2391,7 +2391,8 @@ struct kvm_reg_list { 
This ioctl returns the guest registers that are supported for the

KVM_GET_ONE_REG/KVM_SET_ONE_REG calls.



4.85 KVM_ARM_SET_DEVICE_ADDR



4.85 KVM_ARM_SET_DEVICE_ADDR (deprecated)



Capability: KVM_CAP_ARM_SET_DEVICE_ADDR

Architectures: arm, arm64
@@ -2429,6 +2430,10 @@ must be called after calling KVM_CREATE_IRQCHIP, but before calling 
KVM_RUN on any of the VCPUs.  Calling this ioctl twice for any of the

base addresses will return -EEXIST.



Note, this IOCTL is deprecated and the more flexible SET/GET_DEVICE_ATTR API

should be used instead.





4.86 KVM_PPC_RTAS_DEFINE_TOKEN



Capability: KVM_CAP_PPC_RTAS

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

+11 −0
Original line number Diff line number Diff line
@@ -8,3 +8,14 @@ Only one VGIC instance may be instantiated through either this API or the 
legacy KVM_CREATE_IRQCHIP api.  The created VGIC will act as the VM interrupt

controller, requiring emulated user-space devices to inject interrupts to the

VGIC instead of directly to CPUs.



Groups:

  KVM_DEV_ARM_VGIC_GRP_ADDR

  Attributes:

    KVM_VGIC_V2_ADDR_TYPE_DIST (rw, 64-bit)

      Base address in the guest physical address space of the GIC distributor

      register mappings.



    KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)

      Base address in the guest physical address space of the GIC virtual cpu

      interface register mappings.

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

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,8 @@ struct kvm_arch_memory_slot { 
#define KVM_REG_ARM_VFP_FPINST		0x1009

#define KVM_REG_ARM_VFP_FPINST2		0x100A



/* Device Control API: ARM VGIC */

#define KVM_DEV_ARM_VGIC_GRP_ADDR	0



/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_TYPE_SHIFT		24

arch/arm/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm, 
	case KVM_ARM_DEVICE_VGIC_V2:

		if (!vgic_present)

			return -ENXIO;

		return kvm_vgic_set_addr(kvm, type, dev_addr->addr);

		return kvm_vgic_addr(kvm, type, &dev_addr->addr, true);

	default:

		return -ENODEV;

	}

include/kvm/arm_vgic.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ struct kvm_run; 
struct kvm_exit_mmio;



#ifdef CONFIG_KVM_ARM_VGIC

int kvm_vgic_set_addr(struct kvm *kvm, unsigned long type, u64 addr);

int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);

int kvm_vgic_hyp_init(void);

int kvm_vgic_init(struct kvm *kvm);

int kvm_vgic_create(struct kvm *kvm);