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

Commit eedb3c44 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Sync {tools/,}arch/arm{64}/include/uapi/asm/kvm.h 

The changes in the following csets are not relevant for 'perf kvm' usage
but lets sync it to silence the diff detector in the tools build system:

  e96a006c ("KVM: arm/arm64: vgic: Implement KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO ioctl")
  d017d7b0 ("KVM: arm/arm64: vgic: Implement VGICv3 CPU interface access")
  94574c94 ("KVM: arm/arm64: vgic: Add distributor and redistributor access")

Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Vijaya Kumar K <Vijaya.Kumar@cavium.com>
Cc: Yunlong Song <yunlong.song@huawei.com>
Link: http://lkml.kernel.org/n/tip-nsqxpyzcv4ywesikhhhrgfgc@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f2ba3ee0

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

+13 −0
Original line number Diff line number Diff line
@@ -181,10 +181,23 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2

#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32

#define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)

#define   KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT 32

#define   KVM_DEV_ARM_VGIC_V3_MPIDR_MASK \

			(0xffffffffULL << KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)

#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0

#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)

#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)

#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3

#define KVM_DEV_ARM_VGIC_GRP_CTRL       4

#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK 0x3ff

#define VGIC_LEVEL_INFO_LINE_LEVEL	0



#define   KVM_DEV_ARM_VGIC_CTRL_INIT    0



/* KVM_IRQ_LINE irq field index values */

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

+13 −0
Original line number Diff line number Diff line
@@ -201,10 +201,23 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2

#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32

#define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)

#define   KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT 32

#define   KVM_DEV_ARM_VGIC_V3_MPIDR_MASK \

			(0xffffffffULL << KVM_DEV_ARM_VGIC_V3_MPIDR_SHIFT)

#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0

#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)

#define   KVM_DEV_ARM_VGIC_SYSREG_INSTR_MASK (0xffff)

#define KVM_DEV_ARM_VGIC_GRP_NR_IRQS	3

#define KVM_DEV_ARM_VGIC_GRP_CTRL	4

#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK	0x3ff

#define VGIC_LEVEL_INFO_LINE_LEVEL	0



#define   KVM_DEV_ARM_VGIC_CTRL_INIT	0



/* Device Control API on vcpu fd */