Thread (56 messages) 56 messages, 4 authors, 2021-01-28

Re: [PATCH v6 17/39] powerpc/fsl_booke/32: CacheLockingException remove args

From: Nicholas Piggin <npiggin@gmail.com>
Date: 2021-01-16 10:36:03

Excerpts from Christophe Leroy's message of January 16, 2021 5:38 pm:

Le 16/01/2021 à 01:43, Nicholas Piggin a écrit :
quoted
Excerpts from Christophe Leroy's message of January 16, 2021 3:14 am:
quoted

Le 15/01/2021 à 17:49, Nicholas Piggin a écrit :
quoted
Like other interrupt handler conversions, switch to getting registers
from the pt_regs argument.

Signed-off-by: Nicholas Piggin <npiggin@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 */
   	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
Why isn't the above done in patch 5 ?
I don't think it's required there, is it?
Ah yes, moving the 'stw' is needed only here.

But the comments changes belong to patch 5, you have done exactly similar changes there in 
kernel/head_40x.S

By the way, I think patch 17 could immediately follow patch 5 and patch 18 could follow patch 6.
I can probably do all these. I'll wait a couple of days and check if 
Michael will merge the series before sending an update for small
changes.

Thanks,
Nick
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help