| Message ID | ec286d2cc6989668a96f14543275437d2f3f0e3a.1645099283.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/4] powerpc/ftrace: Don't use lmw/stmw in ftrace_regs_caller() | expand |
On Thu, 17 Feb 2022 13:01:56 +0100, Christophe Leroy wrote: > For the same reason as commit a85c728cb5e1 ("powerpc/32: Don't use > lmw/stmw for saving/restoring non volatile regs"), don't use > lmw/stmw in ftrace_regs_caller(). > > Use the same macros for PPC32 and PPC64. > > > [...] Applied to powerpc/next. [1/4] powerpc/ftrace: Don't use lmw/stmw in ftrace_regs_caller() https://git.kernel.org/powerpc/c/9bdb2eec3dde4d66b71cb4bbaebde0caed2cf0e3 [2/4] powerpc/ftrace: Refactor ftrace_{regs_}caller https://git.kernel.org/powerpc/c/228216716cb5f9a19d70bfc40bdc0d6a7fb7e72f [3/4] powerpc/ftrace: Regroup PPC64 specific operations in ftrace_mprofile.S https://git.kernel.org/powerpc/c/a5f04d1f2724db036ba4087873c0691881932bc9 [4/4] powerpc/ftrace: Use STK_GOT in ftrace_mprofile.S https://git.kernel.org/powerpc/c/2ca48dbb210767b9e7166d7d47febc8fcd1da6e1 cheers
diff --git a/arch/powerpc/kernel/trace/ftrace_mprofile.S b/arch/powerpc/kernel/trace/ftrace_mprofile.S index 89639e64acd1..76dab07fd8fd 100644 --- a/arch/powerpc/kernel/trace/ftrace_mprofile.S +++ b/arch/powerpc/kernel/trace/ftrace_mprofile.S @@ -43,18 +43,16 @@ _GLOBAL(ftrace_regs_caller) /* Save all gprs to pt_regs */ SAVE_GPR(0, r1) -#ifdef CONFIG_PPC64 SAVE_GPRS(2, 11, r1) +#ifdef CONFIG_PPC64 /* Ok to continue? */ lbz r3, PACA_FTRACE_ENABLED(r13) cmpdi r3, 0 beq ftrace_no_trace +#endif SAVE_GPRS(12, 31, r1) -#else - stmw r2, GPR2(r1) -#endif /* Save previous stack pointer (r1) */ addi r8, r1, SWITCH_FRAME_SIZE @@ -120,11 +118,7 @@ ftrace_regs_call: #endif /* Restore gprs */ -#ifdef CONFIG_PPC64 REST_GPRS(2, 31, r1) -#else - lmw r2, GPR2(r1) -#endif /* Restore possibly modified LR */ PPC_LL r0, _LINK(r1)
For the same reason as commit a85c728cb5e1 ("powerpc/32: Don't use lmw/stmw for saving/restoring non volatile regs"), don't use lmw/stmw in ftrace_regs_caller(). Use the same macros for PPC32 and PPC64. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/trace/ftrace_mprofile.S | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)