]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h
authorArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 15 Mar 2017 20:40:19 +0000 (17:40 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 20 Mar 2017 18:02:29 +0000 (15:02 -0300)
The changes in the following csets are not relevant for what is used in
tools/perf/arch/powerpc/util/kvm-stat.c, but lets sync it to silence the
diff detector in the tools build system:

  c92701322711 ("KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU")
  17d48610ae0f ("KVM: PPC: Book 3S: XICS: Implement ICS P/Q states")

Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Li Zhong <zhong@linux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@ozlabs.org>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-nsqxpyzcv4ywesikhhhrgfgc@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/arch/powerpc/include/uapi/asm/kvm.h

index 3603b6f51b11beae38c1c1645086cafc807b07ab..4edbe4bb0e8b0cdd2553c74df9988823990833d9 100644 (file)
@@ -413,6 +413,26 @@ struct kvm_get_htab_header {
        __u16   n_invalid;
 };
 
+/* For KVM_PPC_CONFIGURE_V3_MMU */
+struct kvm_ppc_mmuv3_cfg {
+       __u64   flags;
+       __u64   process_table;  /* second doubleword of partition table entry */
+};
+
+/* Flag values for KVM_PPC_CONFIGURE_V3_MMU */
+#define KVM_PPC_MMUV3_RADIX    1       /* 1 = radix mode, 0 = HPT */
+#define KVM_PPC_MMUV3_GTSE     2       /* global translation shootdown enb. */
+
+/* For KVM_PPC_GET_RMMU_INFO */
+struct kvm_ppc_rmmu_info {
+       struct kvm_ppc_radix_geom {
+               __u8    page_shift;
+               __u8    level_bits[4];
+               __u8    pad[3];
+       }       geometries[8];
+       __u32   ap_encodings[8];
+};
+
 /* Per-vcpu XICS interrupt controller state */
 #define KVM_REG_PPC_ICP_STATE  (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)
 
@@ -613,5 +633,7 @@ struct kvm_get_htab_header {
 #define  KVM_XICS_LEVEL_SENSITIVE      (1ULL << 40)
 #define  KVM_XICS_MASKED               (1ULL << 41)
 #define  KVM_XICS_PENDING              (1ULL << 42)
+#define  KVM_XICS_PRESENTED            (1ULL << 43)
+#define  KVM_XICS_QUEUED               (1ULL << 44)
 
 #endif /* __LINUX_KVM_POWERPC_H */