Re: [RFC PATCH 02/10] powerpc/chrp: Remove various dead code

From
Christophe Leroy <hidden>
Date
2024-11-16 16:15:40
Also in
lkml
Reply to
Michael Ellerman, 2024-11-14

Le 14/11/2024 à 14:11, Michael Ellerman a écrit :
Remove various bits of code that are dead now that PPC_CHRP has been
removed.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
  arch/powerpc/Kconfig                 |  5 +--
  arch/powerpc/boot/Makefile           |  1 -
  arch/powerpc/include/asm/processor.h |  6 ---
  arch/powerpc/kernel/head_book3s_32.S | 12 ------
  arch/powerpc/kernel/pci_32.c         |  2 +-
  arch/powerpc/kernel/prom_init.c      | 56 ----------------------------
  6 files changed, 3 insertions(+), 79 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/arch/powerpc/kernel/head_book3s_32.S b/arch/powerpc/kernel/head_book3s_32.S
index cb2bca76be53..c6e297fd36e2 100644
--- a/arch/powerpc/kernel/head_book3s_32.S
+++ b/arch/powerpc/kernel/head_book3s_32.S
@@ -256,20 +256,8 @@ __secondary_hold_acknowledge:
   */
  	START_EXCEPTION(INTERRUPT_MACHINE_CHECK, MachineCheck)
  	EXCEPTION_PROLOG_0
-#ifdef CONFIG_PPC_CHRP
-	mtspr	SPRN_SPRG_SCRATCH2,r1
-	mfspr	r1, SPRN_SPRG_THREAD
-	lwz	r1, RTAS_SP(r1)
-	cmpwi	cr1, r1, 0
-	bne	cr1, 7f
-	mfspr	r1, SPRN_SPRG_SCRATCH2
-#endif /* CONFIG_PPC_CHRP */
  	EXCEPTION_PROLOG_1
  7:	EXCEPTION_PROLOG_2 0x200 MachineCheck
-#ifdef CONFIG_PPC_CHRP
-	beq	cr1, 1f
-	twi	31, 0, 0
-#endif
  1:	prepare_transfer_to_handler
  	bl	machine_check_exception
  	b	interrupt_return
Then it becomes a standard exception handler that can be set up with

	EXCEPTION(INTERRUPT_MACHINE_CHECK, MachineCheck, machine_check_exception)

And the comment from paulus voids.

Thread (36 messages) 36 messages, 8 authors, last reply 2024-12-12
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help