powerpc/4xx: Remove CONFIG_BOOKE_OR_40x

Now that 40x is gone, replace CONFIG_BOOKE_OR_40x by CONFIG_BOOKE.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240628121201.130802-5-mpe@ellerman.id.au

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index 317659fdeacf2b1bfd2305a7890ffc0d2e7d76e1..569ac1165b0693137cbe33219044878f33cf49e9 100644 (file)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -63,7 +63,7 @@
 
 static inline void __hard_irq_enable(void)
 {
-       if (IS_ENABLED(CONFIG_BOOKE_OR_40x))
+       if (IS_ENABLED(CONFIG_BOOKE))
                wrtee(MSR_EE);
        else if (IS_ENABLED(CONFIG_PPC_8xx))
                wrtspr(SPRN_EIE);
@@ -75,7 +75,7 @@ static inline void __hard_irq_enable(void)
 
 static inline void __hard_irq_disable(void)
 {
-       if (IS_ENABLED(CONFIG_BOOKE_OR_40x))
+       if (IS_ENABLED(CONFIG_BOOKE))
                wrtee(0);
        else if (IS_ENABLED(CONFIG_PPC_8xx))
                wrtspr(SPRN_EID);
@@ -87,7 +87,7 @@ static inline void __hard_irq_disable(void)
 
 static inline void __hard_EE_RI_disable(void)
 {
-       if (IS_ENABLED(CONFIG_BOOKE_OR_40x))
+       if (IS_ENABLED(CONFIG_BOOKE))
                wrtee(0);
        else if (IS_ENABLED(CONFIG_PPC_8xx))
                wrtspr(SPRN_NRI);
@@ -99,7 +99,7 @@ static inline void __hard_EE_RI_disable(void)
 
 static inline void __hard_RI_enable(void)
 {
-       if (IS_ENABLED(CONFIG_BOOKE_OR_40x))
+       if (IS_ENABLED(CONFIG_BOOKE))
                return;
 
        if (IS_ENABLED(CONFIG_PPC_8xx))

diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index ba1a5974e714364cecba82311271c3fc22ea4998..aa3751960ffd8ccf1465fd80be04fd8a388e50f2 100644 (file)
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -33,7 +33,7 @@ extern int distribute_irqs;
 
 struct pt_regs;
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 /*
  * Per-cpu stacks for handling critical, debug and machine check
  * level interrupts.

diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
index ad7e8c5aec3f82f318ef74883d813c0d16d59f29..2bb03d941e3e8ac9d62715e8591893dd8e00cdb4 100644 (file)
--- a/arch/powerpc/include/asm/kup.h
+++ b/arch/powerpc/include/asm/kup.h
@@ -20,7 +20,7 @@ static __always_inline bool kuap_is_disabled(void);
 #include <asm/nohash/32/kup-8xx.h>
 #endif
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 #include <asm/nohash/kup-booke.h>
 #endif
 

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index e44cac0da346f8210fc7561b1e3cae04d1a5b2b0..6b94de17201c769bc4392996b673c81a1e480ab6 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -159,7 +159,7 @@ struct thread_struct {
        unsigned long   sr0;
 #endif
 #endif /* CONFIG_PPC32 */
-#if defined(CONFIG_BOOKE_OR_40x) && defined(CONFIG_PPC_KUAP)
+#if defined(CONFIG_BOOKE) && defined(CONFIG_PPC_KUAP)
        unsigned long   pid;    /* value written in PID reg. at interrupt exit */
 #endif
        /* Debug Registers */

diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index ea8f91fbc62f9f24f5f647b2b6fb3489dcd91155..7b9350756875a70a8f55173d303e9e70c8ed3714 100644 (file)
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -310,7 +310,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc)
 
 static inline bool cpu_has_msr_ri(void)
 {
-       return !IS_ENABLED(CONFIG_BOOKE_OR_40x);
+       return !IS_ENABLED(CONFIG_BOOKE);
 }
 
 static inline bool regs_is_unrecoverable(struct pt_regs *regs)

diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 76c1490f5c97cf952ec6d6bfe954169cb436c8f5..0228c90bbcc7bf1ee9688e74691f9c26ce62f079 100644 (file)
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -18,7 +18,7 @@
 #include <asm/feature-fixups.h>
 
 /* Pickup Book E specific registers. */
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 #include <asm/reg_booke.h>
 #endif
 

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index f029755f9e69af897dbf2bd456dd335e99e3ac04..23733282de4d9f975aa9450b26c1049688e6663e 100644 (file)
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef CONFIG_PPC32
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 #include "head_booke.h"
 #endif
 #endif

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 070eab8b6a286d484970460aa6a22678801d3764..1522164b10e48280bfab904cde52a6b5387b13cc 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -108,7 +108,7 @@ transfer_to_syscall:
        stw     r11, 0(r1)
        mflr    r12
        stw     r12, _LINK(r1)
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
        rlwinm  r9,r9,0,14,12           /* clear MSR_WE (necessary?) */
 #endif
        lis     r12,STACK_FRAME_REGS_MARKER@ha /* exception frame marker */

diff --git a/arch/powerpc/kernel/epapr_hcalls.S b/arch/powerpc/kernel/epapr_hcalls.S
index 1a9b5ae8ccb2f53ab7e84ef137049648057fe49d..6a414ed5a4119e390b0e84b4ffdd692872aaa0cf 100644 (file)
--- a/arch/powerpc/kernel/epapr_hcalls.S
+++ b/arch/powerpc/kernel/epapr_hcalls.S
@@ -21,7 +21,7 @@ _GLOBAL(epapr_ev_idle)
        ori     r4, r4,_TLF_NAPPING     /* so when we take an exception */
        PPC_STL r4, TI_LOCAL_FLAGS(r2)  /* it will return to our caller */
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
        wrteei  1
 #else
        mfmsr   r4

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 7504ceec5c58c782754113dc1e476d1b22dd8ccb..2e1600a8bbbbf657da5d48942982d8d1c741381b 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -333,7 +333,7 @@ void __init init_IRQ(void)
                static_call_update(ppc_get_irq, ppc_md.get_irq);
 }
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 void   *critirq_ctx[NR_CPUS] __read_mostly;
 void    *dbgirq_ctx[NR_CPUS] __read_mostly;
 void *mcheckirq_ctx[NR_CPUS] __read_mostly;

diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index ebe4d1645ca1fd0118013b4d74bdac90050033f1..7a8bc03a00af0931ec50a9571b4b78243d6dc7b5 100644 (file)
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -45,7 +45,7 @@ static struct hard_trap_info
        { 0x0800, 0x08 /* SIGFPE */  },         /* fp unavailable */
        { 0x0900, 0x0e /* SIGALRM */ },         /* decrementer */
        { 0x0c00, 0x14 /* SIGCHLD */ },         /* system call */
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
        { 0x2002, 0x05 /* SIGTRAP */ },         /* debug */
 #if defined(CONFIG_PPC_85xx)
        { 0x2010, 0x08 /* SIGFPE */  },         /* spe unavailable */
@@ -64,7 +64,7 @@ static struct hard_trap_info
        { 0x2010, 0x08 /* SIGFPE */  },         /* fp unavailable */
        { 0x2020, 0x08 /* SIGFPE */  },         /* ap unavailable */
 #endif
-#else /* !CONFIG_BOOKE_OR_40x */
+#else /* !CONFIG_BOOKE */
        { 0x0d00, 0x05 /* SIGTRAP */ },         /* single-step */
 #if defined(CONFIG_PPC_8xx)
        { 0x1000, 0x04 /* SIGILL */  },         /* software emulation */

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index a7671786764b60639c8d3b436964b795096a65e0..0e96bd38570c03eed0661f25e5ece33bf0f11dd8 100644 (file)
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1875,7 +1875,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
 #if defined(CONFIG_PPC_BOOK3S_32) && defined(CONFIG_PPC_KUAP)
        p->thread.kuap = KUAP_NONE;
 #endif
-#if defined(CONFIG_BOOKE_OR_40x) && defined(CONFIG_PPC_KUAP)
+#if defined(CONFIG_BOOKE) && defined(CONFIG_PPC_KUAP)
        p->thread.pid = MMU_NO_CONTEXT;
 #endif
 

diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h
index 7912bb50a7cb82d6dddab83c09bb4adc3079e632..385a00a2e2ca925f5d749139577ad95aa236f373 100644 (file)
--- a/arch/powerpc/kernel/setup.h
+++ b/arch/powerpc/kernel/setup.h
@@ -29,7 +29,7 @@ void setup_tlb_core_data(void);
 static inline void setup_tlb_core_data(void) { }
 #endif
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 void exc_lvl_early_init(void);
 #else
 static inline void exc_lvl_early_init(void) { }

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index b761cc1a403c3df4af9858758a5f635b546b0e58..e515c1f7d8d33be341dc0f0b1eb6ca3cd6b402d0 100644 (file)
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -176,7 +176,7 @@ void __init emergency_stack_init(void)
 }
 #endif
 
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
 void __init exc_lvl_early_init(void)
 {
        unsigned int i, hw_cpu;

diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index c0fdc6d94feee7b11759dc906d231d50076ba94d..0ff9f038e800db6dbc910ce581550b457ee5f2db 100644 (file)
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -695,7 +695,7 @@ static int __init get_freq(char *name, int cells, unsigned long *val)
 
 static void start_cpu_decrementer(void)
 {
-#ifdef CONFIG_BOOKE_OR_40x
+#ifdef CONFIG_BOOKE
        unsigned int tcr;
 
        /* Clear any pending timer interrupts */

diff --git a/arch/powerpc/mm/mmu_context.c b/arch/powerpc/mm/mmu_context.c
index b24c19078eb1867d94522cedfcb70d9eaca104b9..3e3af29b4523730c4a6683d918c7296adb50a594 100644 (file)
--- a/arch/powerpc/mm/mmu_context.c
+++ b/arch/powerpc/mm/mmu_context.c
@@ -21,7 +21,7 @@ static inline void switch_mm_pgdir(struct task_struct *tsk,
 #ifdef CONFIG_PPC_BOOK3S_32
        tsk->thread.sr0 = mm->context.sr0;
 #endif
-#if defined(CONFIG_BOOKE_OR_40x) && defined(CONFIG_PPC_KUAP)
+#if defined(CONFIG_BOOKE) && defined(CONFIG_PPC_KUAP)
        tsk->thread.pid = mm->context.id;
 #endif
 }

diff --git a/arch/powerpc/mm/nohash/mmu_context.c b/arch/powerpc/mm/nohash/mmu_context.c
index 92dc028aff1ffa0195356cd0aef694f687423302..0b181da40ddbb3d4c0375345d95c454f3b0f3378 100644 (file)
--- a/arch/powerpc/mm/nohash/mmu_context.c
+++ b/arch/powerpc/mm/nohash/mmu_context.c
@@ -303,7 +303,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next,
        if (IS_ENABLED(CONFIG_BDI_SWITCH))
                abatron_pteptrs[1] = next->pgd;
        set_context(id, next->pgd);
-#if defined(CONFIG_BOOKE_OR_40x) && defined(CONFIG_PPC_KUAP)
+#if defined(CONFIG_BOOKE) && defined(CONFIG_PPC_KUAP)
        tsk->thread.pid = id;
 #endif
        raw_spin_unlock(&context_lock);

diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 2b686ee2dd2bb5d925c4e25ee24af377be1dd46b..55337628bf92b11c94e75b843348d7f4ef81b96e 100644 (file)
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -335,11 +335,6 @@ config BOOKE
        depends on PPC_E500 || 44x
        default y
 
-config BOOKE_OR_40x
-       bool
-       depends on BOOKE
-       default y
-
 config PTE_64BIT
        bool
        depends on 44x || PPC_E500 || PPC_86xx