KVM: PPC: Make bools bitfields

[~andy/linux] / arch / powerpc / include / asm / kvm_book3s.h

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index fd432100f6db126460d467e3a94ec2e753c44b30..ee7992189c6ec87f1b06f0514681c914066a881e 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -29,39 +29,40 @@ struct kvmppc_slb {
        u64 vsid;
        u64 orige;
        u64 origv;
-       bool valid;
-       bool Ks;
-       bool Kp;
-       bool nx;
-       bool large;     /* PTEs are 16MB */
-       bool tb;        /* 1TB segment */
-       bool class;
+       bool valid      : 1;
+       bool Ks         : 1;
+       bool Kp         : 1;
+       bool nx         : 1;
+       bool large      : 1;    /* PTEs are 16MB */
+       bool tb         : 1;    /* 1TB segment */
+       bool class      : 1;
 };
 
 struct kvmppc_sr {
        u32 raw;
        u32 vsid;
-       bool Ks;
-       bool Kp;
-       bool nx;
+       bool Ks         : 1;
+       bool Kp         : 1;
+       bool nx         : 1;
+       bool valid      : 1;
 };
 
 struct kvmppc_bat {
        u64 raw;
        u32 bepi;
        u32 bepi_mask;
-       bool vs;
-       bool vp;
        u32 brpn;
        u8 wimg;
        u8 pp;
+       bool vs         : 1;
+       bool vp         : 1;
 };
 
 struct kvmppc_sid_map {
        u64 guest_vsid;
        u64 guest_esid;
        u64 host_vsid;
-       bool valid;
+       bool valid      : 1;
 };
 
 #define SID_MAP_BITS    9
@@ -84,8 +85,8 @@ struct kvmppc_vcpu_book3s {
        u64 hid[6];
        u64 gqr[8];
        int slb_nr;
+       u32 dsisr;
        u64 sdr1;
-       u64 dsisr;
        u64 hior;
        u64 msr_mask;
        u64 vsid_first;
@@ -99,11 +100,12 @@ struct kvmppc_vcpu_book3s {
 #define CONTEXT_GUEST          1
 #define CONTEXT_GUEST_END      2
 
-#define VSID_REAL      0xfffffffffff00000
-#define VSID_REAL_DR   0xffffffffffe00000
-#define VSID_REAL_IR   0xffffffffffd00000
-#define VSID_BAT       0xffffffffffc00000
-#define VSID_PR                0x8000000000000000
+#define VSID_REAL_DR   0x7ffffffffff00000ULL
+#define VSID_REAL_IR   0x7fffffffffe00000ULL
+#define VSID_SPLIT_MASK        0x7fffffffffe00000ULL
+#define VSID_REAL      0x7fffffffffc00000ULL
+#define VSID_BAT       0x7fffffffffb00000ULL
+#define VSID_PR                0x8000000000000000ULL
 
 extern void kvmppc_mmu_pte_flush(struct kvm_vcpu *vcpu, u64 ea, u64 ea_mask);
 extern void kvmppc_mmu_pte_vflush(struct kvm_vcpu *vcpu, u64 vp, u64 vp_mask);
@@ -121,6 +123,7 @@ extern void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)
 extern void kvmppc_set_bat(struct kvm_vcpu *vcpu, struct kvmppc_bat *bat,
                           bool upper, u32 val);
 extern void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr);
+extern int kvmppc_emulate_paired_single(struct kvm_run *run, struct kvm_vcpu *vcpu);
 
 extern u32 kvmppc_trampoline_lowmem;
 extern u32 kvmppc_trampoline_enter;
@@ -128,6 +131,8 @@ extern void kvmppc_rmcall(ulong srr0, ulong srr1);
 extern void kvmppc_load_up_fpu(void);
 extern void kvmppc_load_up_altivec(void);
 extern void kvmppc_load_up_vsx(void);
+extern u32 kvmppc_alignment_dsisr(struct kvm_vcpu *vcpu, unsigned int inst);
+extern ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst);
 
 static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu)
 {
@@ -143,6 +148,11 @@ static inline ulong dsisr(void)
 
 extern void kvm_return_point(void);
 
+/* Magic register values loaded into r3 and r4 before the 'sc' assembly
+ * instruction for the OSI hypercalls */
+#define OSI_SC_MAGIC_R3                        0x113724FA
+#define OSI_SC_MAGIC_R4                        0x77810F9B
+
 #define INS_DCBZ                       0x7c0007ec
 
 #endif /* __ASM_KVM_BOOK3S_H__ */