Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 46 insertions, 0 deletions

diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
index 56bfae59837f..aadf2dd6f84e 100644
--- a/arch/powerpc/include/asm/kvm_asm.h
+++ b/arch/powerpc/include/asm/kvm_asm.h
@@ -49,6 +49,46 @@
 #define BOOKE_INTERRUPT_SPE_FP_ROUND 34
 #define BOOKE_INTERRUPT_PERFORMANCE_MONITOR 35
 
+/* book3s */
+
+#define BOOK3S_INTERRUPT_SYSTEM_RESET   0x100
+#define BOOK3S_INTERRUPT_MACHINE_CHECK  0x200
+#define BOOK3S_INTERRUPT_DATA_STORAGE   0x300
+#define BOOK3S_INTERRUPT_DATA_SEGMENT   0x380
+#define BOOK3S_INTERRUPT_INST_STORAGE   0x400
+#define BOOK3S_INTERRUPT_INST_SEGMENT   0x480
+#define BOOK3S_INTERRUPT_EXTERNAL       0x500
+#define BOOK3S_INTERRUPT_ALIGNMENT      0x600
+#define BOOK3S_INTERRUPT_PROGRAM        0x700
+#define BOOK3S_INTERRUPT_FP_UNAVAIL     0x800
+#define BOOK3S_INTERRUPT_DECREMENTER    0x900
+#define BOOK3S_INTERRUPT_SYSCALL        0xc00
+#define BOOK3S_INTERRUPT_TRACE          0xd00
+#define BOOK3S_INTERRUPT_PERFMON        0xf00
+#define BOOK3S_INTERRUPT_ALTIVEC        0xf20
+#define BOOK3S_INTERRUPT_VSX            0xf40
+
+#define BOOK3S_IRQPRIO_SYSTEM_RESET             0
+#define BOOK3S_IRQPRIO_DATA_SEGMENT             1
+#define BOOK3S_IRQPRIO_INST_SEGMENT             2
+#define BOOK3S_IRQPRIO_DATA_STORAGE             3
+#define BOOK3S_IRQPRIO_INST_STORAGE             4
+#define BOOK3S_IRQPRIO_ALIGNMENT                5
+#define BOOK3S_IRQPRIO_PROGRAM                  6
+#define BOOK3S_IRQPRIO_FP_UNAVAIL               7
+#define BOOK3S_IRQPRIO_ALTIVEC                  8
+#define BOOK3S_IRQPRIO_VSX                      9
+#define BOOK3S_IRQPRIO_SYSCALL                  10
+#define BOOK3S_IRQPRIO_MACHINE_CHECK            11
+#define BOOK3S_IRQPRIO_DEBUG                    12
+#define BOOK3S_IRQPRIO_EXTERNAL                 13
+#define BOOK3S_IRQPRIO_DECREMENTER              14
+#define BOOK3S_IRQPRIO_PERFORMANCE_MONITOR      15
+#define BOOK3S_IRQPRIO_MAX                      16
+
+#define BOOK3S_HFLAG_DCBZ32                     0x1
+#define BOOK3S_HFLAG_SLB                        0x2
+
 #define RESUME_FLAG_NV          (1<<0)  /* Reload guest nonvolatile state? */
 #define RESUME_FLAG_HOST        (1<<1)  /* Resume host? */
 
@@ -57,4 +97,10 @@
 #define RESUME_HOST             RESUME_FLAG_HOST
 #define RESUME_HOST_NV          (RESUME_FLAG_HOST|RESUME_FLAG_NV)
 
+#define KVM_GUEST_MODE_NONE     0
+#define KVM_GUEST_MODE_GUEST    1
+#define KVM_GUEST_MODE_SKIP     2
+
+#define KVM_INST_FETCH_FAILED   -1
+
 #endif /* __POWERPC_KVM_ASM_H__ */