|
@@ -53,6 +53,7 @@
|
|
|
#ifdef CONFIG_PPC64
|
|
|
#include <asm/firmware.h>
|
|
|
#include <asm/processor.h>
|
|
|
+#include <asm/tm.h>
|
|
|
#endif
|
|
|
#include <asm/kexec.h>
|
|
|
#include <asm/ppc-opcode.h>
|
|
@@ -932,6 +933,28 @@ static int emulate_isel(struct pt_regs *regs, u32 instword)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
|
|
|
+static inline bool tm_abort_check(struct pt_regs *regs, int cause)
|
|
|
+{
|
|
|
+ /* If we're emulating a load/store in an active transaction, we cannot
|
|
|
+ * emulate it as the kernel operates in transaction suspended context.
|
|
|
+ * We need to abort the transaction. This creates a persistent TM
|
|
|
+ * abort so tell the user what caused it with a new code.
|
|
|
+ */
|
|
|
+ if (MSR_TM_TRANSACTIONAL(regs->msr)) {
|
|
|
+ tm_enable();
|
|
|
+ tm_abort(cause);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+}
|
|
|
+#else
|
|
|
+static inline bool tm_abort_check(struct pt_regs *regs, int reason)
|
|
|
+{
|
|
|
+ return false;
|
|
|
+}
|
|
|
+#endif
|
|
|
+
|
|
|
static int emulate_instruction(struct pt_regs *regs)
|
|
|
{
|
|
|
u32 instword;
|
|
@@ -971,6 +994,9 @@ static int emulate_instruction(struct pt_regs *regs)
|
|
|
|
|
|
/* Emulate load/store string insn. */
|
|
|
if ((instword & PPC_INST_STRING_GEN_MASK) == PPC_INST_STRING) {
|
|
|
+ if (tm_abort_check(regs,
|
|
|
+ TM_CAUSE_EMULATE | TM_CAUSE_PERSISTENT))
|
|
|
+ return -EINVAL;
|
|
|
PPC_WARN_EMULATED(string, regs);
|
|
|
return emulate_string_inst(regs, instword);
|
|
|
}
|
|
@@ -1148,6 +1174,9 @@ void alignment_exception(struct pt_regs *regs)
|
|
|
if (!arch_irq_disabled_regs(regs))
|
|
|
local_irq_enable();
|
|
|
|
|
|
+ if (tm_abort_check(regs, TM_CAUSE_ALIGNMENT | TM_CAUSE_PERSISTENT))
|
|
|
+ goto bail;
|
|
|
+
|
|
|
/* we don't implement logging of alignment exceptions */
|
|
|
if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))
|
|
|
fixed = fix_alignment(regs);
|