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

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

tools headers: Synchronize KVM arch ABI headers 

To pick up changes from these csets:

  da9a1446 ("KVM: s390: provide a capability for AIS state migration")
  5c5196da ("KVM: arm/arm64: Support EL1 phys timer register access in set/get reg")

None of which affects buildint tools/perf/.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Christoffer Dall <cdall@linaro.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-dd72s6izo4qdzt1isowlz8ji@git.kernel.org


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

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -152,6 +152,12 @@ struct kvm_arch_memory_slot { 
	(__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)

	(__ARM_CP15_REG(op1, 0, crm, 0) | KVM_REG_SIZE_U64)

#define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__)

#define ARM_CP15_REG64(...) __ARM_CP15_REG64(__VA_ARGS__)





/* PL1 Physical Timer Registers */

#define KVM_REG_ARM_PTIMER_CTL		ARM_CP15_REG32(0, 14, 2, 1)

#define KVM_REG_ARM_PTIMER_CNT		ARM_CP15_REG64(0, 14)

#define KVM_REG_ARM_PTIMER_CVAL		ARM_CP15_REG64(2, 14)



/* Virtual Timer Registers */

#define KVM_REG_ARM_TIMER_CTL		ARM_CP15_REG32(0, 14, 3, 1)

#define KVM_REG_ARM_TIMER_CTL		ARM_CP15_REG32(0, 14, 3, 1)

#define KVM_REG_ARM_TIMER_CNT		ARM_CP15_REG64(1, 14)

#define KVM_REG_ARM_TIMER_CNT		ARM_CP15_REG64(1, 14)

#define KVM_REG_ARM_TIMER_CVAL		ARM_CP15_REG64(3, 14)

#define KVM_REG_ARM_TIMER_CVAL		ARM_CP15_REG64(3, 14)
@@ -216,6 +222,7 @@ struct kvm_arch_memory_slot { 
#define   KVM_DEV_ARM_ITS_SAVE_TABLES		1

#define   KVM_DEV_ARM_ITS_SAVE_TABLES		1

#define   KVM_DEV_ARM_ITS_RESTORE_TABLES	2

#define   KVM_DEV_ARM_ITS_RESTORE_TABLES	2

#define   KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES	3

#define   KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES	3

#define   KVM_DEV_ARM_ITS_CTRL_RESET		4





/* KVM_IRQ_LINE irq field index values */

/* KVM_IRQ_LINE irq field index values */

#define KVM_ARM_IRQ_TYPE_SHIFT		24

#define KVM_ARM_IRQ_TYPE_SHIFT		24

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -196,6 +196,12 @@ struct kvm_arch_memory_slot { 




#define ARM64_SYS_REG(...) (__ARM64_SYS_REG(__VA_ARGS__) | KVM_REG_SIZE_U64)

#define ARM64_SYS_REG(...) (__ARM64_SYS_REG(__VA_ARGS__) | KVM_REG_SIZE_U64)





/* Physical Timer EL0 Registers */

#define KVM_REG_ARM_PTIMER_CTL		ARM64_SYS_REG(3, 3, 14, 2, 1)

#define KVM_REG_ARM_PTIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 2, 2)

#define KVM_REG_ARM_PTIMER_CNT		ARM64_SYS_REG(3, 3, 14, 0, 1)



/* EL0 Virtual Timer Registers */

#define KVM_REG_ARM_TIMER_CTL		ARM64_SYS_REG(3, 3, 14, 3, 1)

#define KVM_REG_ARM_TIMER_CTL		ARM64_SYS_REG(3, 3, 14, 3, 1)

#define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)

#define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)

#define KVM_REG_ARM_TIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 0, 2)

#define KVM_REG_ARM_TIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 0, 2)
@@ -228,6 +234,7 @@ struct kvm_arch_memory_slot { 
#define   KVM_DEV_ARM_ITS_SAVE_TABLES           1

#define   KVM_DEV_ARM_ITS_SAVE_TABLES           1

#define   KVM_DEV_ARM_ITS_RESTORE_TABLES        2

#define   KVM_DEV_ARM_ITS_RESTORE_TABLES        2

#define   KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES	3

#define   KVM_DEV_ARM_VGIC_SAVE_PENDING_TABLES	3

#define   KVM_DEV_ARM_ITS_CTRL_RESET		4





/* Device Control API on vcpu fd */

/* Device Control API on vcpu fd */

#define KVM_ARM_VCPU_PMU_V3_CTRL	0

#define KVM_ARM_VCPU_PMU_V3_CTRL	0

tools/include/uapi/linux/kvm.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -931,6 +931,7 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_PPC_SMT_POSSIBLE 147

#define KVM_CAP_PPC_SMT_POSSIBLE 147

#define KVM_CAP_HYPERV_SYNIC2 148

#define KVM_CAP_HYPERV_SYNIC2 148

#define KVM_CAP_HYPERV_VP_INDEX 149

#define KVM_CAP_HYPERV_VP_INDEX 149

#define KVM_CAP_S390_AIS_MIGRATION 150





#ifdef KVM_CAP_IRQ_ROUTING

#ifdef KVM_CAP_IRQ_ROUTING