tools headers kvm: Sync ARM UAPI headers with the kernel sources

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 10, 2018

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2018-05-10 18:15 UTC #0 lore raw

Commit-ID:  5981ec36688c49b7262f399c1a10edecc6e55ed2
Gitweb:     https://git.kernel.org/tip/5981ec36688c49b7262f399c1a10edecc6e55ed2
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 7 May 2018 13:23:19 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 7 May 2018 15:23:46 -0300

tools headers kvm: Sync ARM UAPI headers with the kernel sources

To sync with the changes made in 85bd0ba1ff98 ("arm/arm64: KVM: Add PSCI version selection API"), that do not cause any changes in the tools, just to silence the build warning:

Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm/include/uapi/asm/kvm.h'
Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h'

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Marc Zyngier <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link https://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/arch/arm/include/uapi/asm/kvm.h   | 6 ++++++
 tools/arch/arm64/include/uapi/asm/kvm.h | 6 ++++++
 2 files changed, 12 insertions(+)

tools/arch/arm/include/uapi/asm/kvm.h +6 -0

index 2ba95d6fe852..caae4843cb70 100644
@@ -195,6 +195,12 @@ struct kvm_arch_memory_slot {
 #define KVM_REG_ARM_VFP_FPINST		0x1009
 #define KVM_REG_ARM_VFP_FPINST2		0x100A
 
+/* KVM-as-firmware specific pseudo-registers */
+#define KVM_REG_ARM_FW			(0x0014 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM_FW_REG(r)		(KVM_REG_ARM | KVM_REG_SIZE_U64 | \
+					 KVM_REG_ARM_FW | ((r) & 0xffff))
+#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)
+
 /* Device Control API: ARM VGIC */
 #define KVM_DEV_ARM_VGIC_GRP_ADDR	0
 #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1

tools/arch/arm64/include/uapi/asm/kvm.h +6 -0

index 9abbf3044654..04b3256f8e6d 100644
@@ -206,6 +206,12 @@ struct kvm_arch_memory_slot {
 #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)
 
+/* KVM-as-firmware specific pseudo-registers */
+#define KVM_REG_ARM_FW			(0x0014 << KVM_REG_ARM_COPROC_SHIFT)
+#define KVM_REG_ARM_FW_REG(r)		(KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \
+					 KVM_REG_ARM_FW | ((r) & 0xffff))
+#define KVM_REG_ARM_PSCI_VERSION	KVM_REG_ARM_FW_REG(0)
+
 /* Device Control API: ARM VGIC */
 #define KVM_DEV_ARM_VGIC_GRP_ADDR	0
 #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1