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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=5981ec36688c49b7262f399c1a10edecc6e55ed2
Commit:     5981ec36688c49b7262f399c1a10edecc6e55ed2
Parent:     d0e9f4c1a4e777c4d1122758137fc47238f4f015
Author:     Arnaldo Carvalho de Melo <acme at redhat.com>
AuthorDate: Mon May 7 13:23:19 2018 -0300
Committer:  Arnaldo Carvalho de Melo <acme at redhat.com>
CommitDate: Mon May 7 15:23:46 2018 -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 <adrian.hunter at intel.com>
    Cc: David Ahern <dsahern at gmail.com>
    Cc: Jiri Olsa <jolsa at kernel.org>
    Cc: Marc Zyngier <marc.zyngier at arm.com>
    Cc: Namhyung Kim <namhyung at kernel.org>
    Cc: Wang Nan <wangnan0 at huawei.com>
    Link: https://lkml.kernel.org/n/tip-7u37pv09xtvet1ll27840w73@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
---
 tools/arch/arm/include/uapi/asm/kvm.h   | 6 ++++++
 tools/arch/arm64/include/uapi/asm/kvm.h | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/tools/arch/arm/include/uapi/asm/kvm.h b/tools/arch/arm/include/uapi/asm/kvm.h
index 2ba95d6fe852..caae4843cb70 100644
--- a/tools/arch/arm/include/uapi/asm/kvm.h
+++ b/tools/arch/arm/include/uapi/asm/kvm.h
@@ -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
diff --git a/tools/arch/arm64/include/uapi/asm/kvm.h b/tools/arch/arm64/include/uapi/asm/kvm.h
index 9abbf3044654..04b3256f8e6d 100644
--- a/tools/arch/arm64/include/uapi/asm/kvm.h
+++ b/tools/arch/arm64/include/uapi/asm/kvm.h
@@ -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