[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-nsqxpyzcv4ywesikhhhrgfgc@git.kernel.org>
Date: Mon, 20 Mar 2017 23:54:07 -0700
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: naveen.n.rao@...ux.vnet.ibm.com, acme@...hat.com,
srikar@...ux.vnet.ibm.com, hpa@...or.com, dsahern@...il.com,
linux-kernel@...r.kernel.org, mpe@...erman.id.au,
zhong@...ux.vnet.ibm.com, paulus@...abs.org, mingo@...nel.org,
yarygin@...ux.vnet.ibm.com, tglx@...utronix.de,
scottwood@...escale.com
Subject: [tip:perf/core] tools headers: Sync
{tools/,}arch/powerpc/include/uapi/asm/kvm.h
Commit-ID: affa6c169bae8dc9cb1a2d070c7cd2fe1939c5b8
Gitweb: http://git.kernel.org/tip/affa6c169bae8dc9cb1a2d070c7cd2fe1939c5b8
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Wed, 15 Mar 2017 17:40:19 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 20 Mar 2017 15:02:29 -0300
tools headers: Sync {tools/,}arch/powerpc/include/uapi/asm/kvm.h
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@...ux.vnet.ibm.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Li Zhong <zhong@...ux.vnet.ibm.com>
Cc: Michael Ellerman <mpe@...erman.id.au>
Cc: Naveen N. Rao <naveen.n.rao@...ux.vnet.ibm.com>
Cc: Paul Mackerras <paulus@...abs.org>
Cc: Scott Wood <scottwood@...escale.com>
Cc: Srikar Dronamraju <srikar@...ux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-nsqxpyzcv4ywesikhhhrgfgc@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/arch/powerpc/include/uapi/asm/kvm.h | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/tools/arch/powerpc/include/uapi/asm/kvm.h b/tools/arch/powerpc/include/uapi/asm/kvm.h
index 3603b6f..4edbe4b 100644
--- a/tools/arch/powerpc/include/uapi/asm/kvm.h
+++ b/tools/arch/powerpc/include/uapi/asm/kvm.h
@@ -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 */
Powered by blists - more mailing lists