1 files changed, 27 insertions, 0 deletions

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index e09ac51961d7..7844c285f6e1 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -29,6 +29,10 @@
 #define MSR_SF_LG       63              /* Enable 64 bit mode */
 #define MSR_ISF_LG      61              /* Interrupt 64b mode valid on 630 */
 #define MSR_HV_LG       60              /* Hypervisor state */
+#define MSR_TS_T_LG     34              /* Trans Mem state: Transactional */
+#define MSR_TS_S_LG     33              /* Trans Mem state: Suspended */
+#define MSR_TS_LG       33              /* Trans Mem state (2 bits) */
+#define MSR_TM_LG       32              /* Trans Mem Available */
 #define MSR_VEC_LG      25              /* Enable AltiVec */
 #define MSR_VSX_LG      23              /* Enable VSX */
 #define MSR_POW_LG      18              /* Enable Power Management */
@@ -98,6 +102,25 @@
 #define MSR_RI          __MASK(MSR_RI_LG)       /* Recoverable Exception */
 #define MSR_LE          __MASK(MSR_LE_LG)       /* Little Endian */
 
+#define MSR_TM          __MASK(MSR_TM_LG)       /* Transactional Mem Available */
+#define MSR_TS_N        0                       /*  Non-transactional */
+#define MSR_TS_S        __MASK(MSR_TS_S_LG)     /*  Transaction Suspended */
+#define MSR_TS_T        __MASK(MSR_TS_T_LG)     /*  Transaction Transactional */
+#define MSR_TS_MASK     (MSR_TS_T | MSR_TS_S)   /* Transaction State bits */
+#define MSR_TM_ACTIVE(x) (((x) & MSR_TS_MASK) != 0) /* Transaction active? */
+#define MSR_TM_TRANSACTIONAL(x) (((x) & MSR_TS_MASK) == MSR_TS_T)
+#define MSR_TM_SUSPENDED(x)     (((x) & MSR_TS_MASK) == MSR_TS_S)
+
+/* Reason codes describing kernel causes for transaction aborts.  By
+   convention, bit0 is copied to TEXASR[56] (IBM bit 7) which is set if
+   the failure is persistent.
+*/
+#define TM_CAUSE_RESCHED        0xfe
+#define TM_CAUSE_TLBI           0xfc
+#define TM_CAUSE_FAC_UNAV       0xfa
+#define TM_CAUSE_SYSCALL        0xf9 /* Persistent */
+#define TM_CAUSE_MISC           0xf6
+
 #if defined(CONFIG_PPC_BOOK3S_64)
 #define MSR_64BIT       MSR_SF
 
@@ -193,6 +216,10 @@
 #define SPRN_UAMOR      0x9d    /* User Authority Mask Override Register */
 #define SPRN_AMOR       0x15d   /* Authority Mask Override Register */
 #define SPRN_ACOP       0x1F    /* Available Coprocessor Register */
+#define SPRN_TFIAR      0x81    /* Transaction Failure Inst Addr   */
+#define SPRN_TEXASR     0x82    /* Transaction EXception & Summary */
+#define SPRN_TEXASRU    0x83    /* ''      ''      ''    Upper 32  */
+#define SPRN_TFHAR      0x80    /* Transaction Failure Handler Addr */
 #define SPRN_CTRLF      0x088
 #define SPRN_CTRLT      0x098
 #define   CTRL_CT       0xc0000000      /* current thread */