Turns out the tcheck() helpers were subtly wrong
Signed-off-by: Cyril Bur <cyril...@gmail.com>
---
tools/testing/selftests/powerpc/tm/tm.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/powerpc/tm/tm.h
b/tools/testing/selftests/powerpc/tm/tm.h
index df4204247d45..e187a0d3160c 100644
--- a/tools/testing/selftests/powerpc/tm/tm.h
+++ b/tools/testing/selftests/powerpc/tm/tm.h
@@ -57,11 +57,11 @@ static inline bool failure_is_nesting(void)
return (__builtin_get_texasru() & 0x400000);
}
-static inline int tcheck(void)
+static inline uint8_t tcheck(void)
{
- long cr;
- asm volatile ("tcheck 0" : "=r"(cr) : : "cr0");
- return (cr >> 28) & 4;
+ unsigned long cr;
+ asm volatile ("tcheck 0; mfcr %0;" : "=r"(cr) : : "cr0");
+ return (cr >> 28) & 0xF;
}
static inline bool tcheck_doomed(void)
@@ -81,7 +81,7 @@ static inline bool tcheck_suspended(void)
static inline bool tcheck_transactional(void)
{
- return tcheck() & 6;
+ return (tcheck_active()) || (tcheck_suspended());
}
#endif /* _SELFTESTS_POWERPC_TM_TM_H */
--
2.16.2
