On Sat, Jan 30, 2021 at 11:08:17PM +1000, Nicholas Piggin wrote:
> Like other interrupt handler conversions, switch to getting registers
> from the pt_regs argument.
>
> Signed-off-by: Nicholas Piggin <npig...@gmail.com>
> ---
> arch/powerpc/kernel/head_fsl_booke.S | 6 +++---
> arch/powerpc/kernel/traps.c | 5 +++--
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kernel/head_fsl_booke.S
> b/arch/powerpc/kernel/head_fsl_booke.S
> index fdd4d274c245..0d4d9a6fcca1 100644
> --- a/arch/powerpc/kernel/head_fsl_booke.S
> +++ b/arch/powerpc/kernel/head_fsl_booke.S
> @@ -364,12 +364,12 @@ interrupt_base:
> /* Data Storage Interrupt */
> START_EXCEPTION(DataStorage)
> NORMAL_EXCEPTION_PROLOG(DATA_STORAGE)
> - mfspr r5,SPRN_ESR /* Grab the ESR, save it, pass arg3 */
> + mfspr r5,SPRN_ESR /* Grab the ESR, save it3 */
^^^^^^^^^^
Sorry for the nitpick.. Should be "/* Grab the ESR, save it */"
> stw r5,_ESR(r11)
> - mfspr r4,SPRN_DEAR /* Grab the DEAR, save it, pass arg2 */
> + mfspr r4,SPRN_DEAR /* Grab the DEAR, save it */
> + stw r4, _DEAR(r11)
> andis. r10,r5,(ESR_ILK|ESR_DLK)@h
> bne 1f
> - stw r4, _DEAR(r11)
> EXC_XFER_LITE(0x0300, handle_page_fault)
> 1:
> addi r3,r1,STACK_FRAME_OVERHEAD
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index 3ec7b443fe6b..1c77b1a8f7c9 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -2062,9 +2062,10 @@ void altivec_assist_exception(struct pt_regs *regs)
> #endif /* CONFIG_ALTIVEC */
>
> #ifdef CONFIG_FSL_BOOKE
> -void CacheLockingException(struct pt_regs *regs, unsigned long address,
> - unsigned long error_code)
> +void CacheLockingException(struct pt_regs *regs)
> {
> + unsigned long error_code = regs->dsisr;
> +
> /* We treat cache locking instructions from the user
> * as priv ops, in the future we could try to do
> * something smarter
> --
> 2.23.0
>
