Skip to content

L
linux
Commit 002b27a5 authored by Michael Ellerman's avatar Michael Ellerman
Browse files
Options

powerpc/4xx: Remove CONFIG_BOOKE_OR_40x 

Now that 40x is gone, replace CONFIG_BOOKE_OR_40x by CONFIG_BOOKE.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240628121201.130802-5-mpe@ellerman.id.au
parent 732b32da
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 26 deletions
arch/powerpc/include/asm/hw_irq.h
View file @ 002b27a5
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
static inline void __hard_irq_enable(void) static inline void __hard_irq_enable(void)
{ {
if (IS_ENABLED(CONFIG_BOOKE_OR_40x)) if (IS_ENABLED(CONFIG_BOOKE))
wrtee(MSR_EE); wrtee(MSR_EE);
else if (IS_ENABLED(CONFIG_PPC_8xx)) else if (IS_ENABLED(CONFIG_PPC_8xx))
wrtspr(SPRN_EIE); wrtspr(SPRN_EIE);
...@@ -75,7 +75,7 @@ static inline void __hard_irq_enable(void) ...@@ -75,7 +75,7 @@ static inline void __hard_irq_enable(void)
static inline void __hard_irq_disable(void) static inline void __hard_irq_disable(void)
{ {
if (IS_ENABLED(CONFIG_BOOKE_OR_40x)) if (IS_ENABLED(CONFIG_BOOKE))
wrtee(0); wrtee(0);
else if (IS_ENABLED(CONFIG_PPC_8xx)) else if (IS_ENABLED(CONFIG_PPC_8xx))
wrtspr(SPRN_EID); wrtspr(SPRN_EID);
...@@ -87,7 +87,7 @@ static inline void __hard_irq_disable(void) ...@@ -87,7 +87,7 @@ static inline void __hard_irq_disable(void)
static inline void __hard_EE_RI_disable(void) static inline void __hard_EE_RI_disable(void)
{ {
if (IS_ENABLED(CONFIG_BOOKE_OR_40x)) if (IS_ENABLED(CONFIG_BOOKE))
wrtee(0); wrtee(0);
else if (IS_ENABLED(CONFIG_PPC_8xx)) else if (IS_ENABLED(CONFIG_PPC_8xx))
wrtspr(SPRN_NRI); wrtspr(SPRN_NRI);
...@@ -99,7 +99,7 @@ static inline void __hard_EE_RI_disable(void) ...@@ -99,7 +99,7 @@ static inline void __hard_EE_RI_disable(void)
static inline void __hard_RI_enable(void) static inline void __hard_RI_enable(void)
{ {
if (IS_ENABLED(CONFIG_BOOKE_OR_40x)) if (IS_ENABLED(CONFIG_BOOKE))
return; return;
if (IS_ENABLED(CONFIG_PPC_8xx)) if (IS_ENABLED(CONFIG_PPC_8xx))
......
arch/powerpc/include/asm/irq.h
View file @ 002b27a5
...@@ -33,7 +33,7 @@ extern int distribute_irqs; ...@@ -33,7 +33,7 @@ extern int distribute_irqs;
struct pt_regs; struct pt_regs;
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
/* /*
* Per-cpu stacks for handling critical, debug and machine check * Per-cpu stacks for handling critical, debug and machine check
* level interrupts. * level interrupts.
......
arch/powerpc/include/asm/kup.h
View file @ 002b27a5
...@@ -20,7 +20,7 @@ static __always_inline bool kuap_is_disabled(void); ...@@ -20,7 +20,7 @@ static __always_inline bool kuap_is_disabled(void);
#include <asm/nohash/32/kup-8xx.h> #include <asm/nohash/32/kup-8xx.h>
#endif #endif
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
#include <asm/nohash/kup-booke.h> #include <asm/nohash/kup-booke.h>
#endif #endif
......
arch/powerpc/include/asm/processor.h
View file @ 002b27a5
...@@ -159,7 +159,7 @@ struct thread_struct { ...@@ -159,7 +159,7 @@ struct thread_struct {
unsigned long sr0; unsigned long sr0;
#endif #endif
#endif /* CONFIG_PPC32 */ #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 */ unsigned long pid; /* value written in PID reg. at interrupt exit */
#endif #endif
/* Debug Registers */ /* Debug Registers */
......
arch/powerpc/include/asm/ptrace.h
View file @ 002b27a5
...@@ -310,7 +310,7 @@ static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc) ...@@ -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) 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) static inline bool regs_is_unrecoverable(struct pt_regs *regs)
......
arch/powerpc/include/asm/reg.h
View file @ 002b27a5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/feature-fixups.h> #include <asm/feature-fixups.h>
/* Pickup Book E specific registers. */ /* Pickup Book E specific registers. */
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
#include <asm/reg_booke.h> #include <asm/reg_booke.h>
#endif #endif
......
arch/powerpc/kernel/asm-offsets.c
View file @ 002b27a5
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#endif #endif
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
#include "head_booke.h" #include "head_booke.h"
#endif #endif
#endif #endif
......
arch/powerpc/kernel/entry_32.S
View file @ 002b27a5
...@@ -108,7 +108,7 @@ transfer_to_syscall: ...@@ -108,7 +108,7 @@ transfer_to_syscall:
stw r11, 0(r1) stw r11, 0(r1)
mflr r12 mflr r12
stw r12, _LINK(r1) stw r12, _LINK(r1)
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
rlwinm r9,r9,0,14,12 /* clear MSR_WE (necessary?) */ rlwinm r9,r9,0,14,12 /* clear MSR_WE (necessary?) */
#endif #endif
lis r12,STACK_FRAME_REGS_MARKER@ha /* exception frame marker */ lis r12,STACK_FRAME_REGS_MARKER@ha /* exception frame marker */
......
arch/powerpc/kernel/epapr_hcalls.S
View file @ 002b27a5
...@@ -21,7 +21,7 @@ _GLOBAL(epapr_ev_idle) ...@@ -21,7 +21,7 @@ _GLOBAL(epapr_ev_idle)
ori r4, r4,_TLF_NAPPING /* so when we take an exception */ ori r4, r4,_TLF_NAPPING /* so when we take an exception */
PPC_STL r4, TI_LOCAL_FLAGS(r2) /* it will return to our caller */ PPC_STL r4, TI_LOCAL_FLAGS(r2) /* it will return to our caller */
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
wrteei 1 wrteei 1
#else #else
mfmsr r4 mfmsr r4
......
arch/powerpc/kernel/irq.c
View file @ 002b27a5
...@@ -333,7 +333,7 @@ void __init init_IRQ(void) ...@@ -333,7 +333,7 @@ void __init init_IRQ(void)
static_call_update(ppc_get_irq, ppc_md.get_irq); 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 *critirq_ctx[NR_CPUS] __read_mostly;
void *dbgirq_ctx[NR_CPUS] __read_mostly; void *dbgirq_ctx[NR_CPUS] __read_mostly;
void *mcheckirq_ctx[NR_CPUS] __read_mostly; void *mcheckirq_ctx[NR_CPUS] __read_mostly;
......
arch/powerpc/kernel/kgdb.c
View file @ 002b27a5
...@@ -45,7 +45,7 @@ static struct hard_trap_info ...@@ -45,7 +45,7 @@ static struct hard_trap_info
{ 0x0800, 0x08 /* SIGFPE */ }, /* fp unavailable */ { 0x0800, 0x08 /* SIGFPE */ }, /* fp unavailable */
{ 0x0900, 0x0e /* SIGALRM */ }, /* decrementer */ { 0x0900, 0x0e /* SIGALRM */ }, /* decrementer */
{ 0x0c00, 0x14 /* SIGCHLD */ }, /* system call */ { 0x0c00, 0x14 /* SIGCHLD */ }, /* system call */
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
{ 0x2002, 0x05 /* SIGTRAP */ }, /* debug */ { 0x2002, 0x05 /* SIGTRAP */ }, /* debug */
#if defined(CONFIG_PPC_85xx) #if defined(CONFIG_PPC_85xx)
{ 0x2010, 0x08 /* SIGFPE */ }, /* spe unavailable */ { 0x2010, 0x08 /* SIGFPE */ }, /* spe unavailable */
...@@ -64,7 +64,7 @@ static struct hard_trap_info ...@@ -64,7 +64,7 @@ static struct hard_trap_info
{ 0x2010, 0x08 /* SIGFPE */ }, /* fp unavailable */ { 0x2010, 0x08 /* SIGFPE */ }, /* fp unavailable */
{ 0x2020, 0x08 /* SIGFPE */ }, /* ap unavailable */ { 0x2020, 0x08 /* SIGFPE */ }, /* ap unavailable */
#endif #endif
#else /* !CONFIG_BOOKE_OR_40x */ #else /* !CONFIG_BOOKE */
{ 0x0d00, 0x05 /* SIGTRAP */ }, /* single-step */ { 0x0d00, 0x05 /* SIGTRAP */ }, /* single-step */
#if defined(CONFIG_PPC_8xx) #if defined(CONFIG_PPC_8xx)
{ 0x1000, 0x04 /* SIGILL */ }, /* software emulation */ { 0x1000, 0x04 /* SIGILL */ }, /* software emulation */
......
arch/powerpc/kernel/process.c
View file @ 002b27a5
...@@ -1875,7 +1875,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) ...@@ -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) #if defined(CONFIG_PPC_BOOK3S_32) && defined(CONFIG_PPC_KUAP)
p->thread.kuap = KUAP_NONE; p->thread.kuap = KUAP_NONE;
#endif #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; p->thread.pid = MMU_NO_CONTEXT;
#endif #endif
......
arch/powerpc/kernel/setup.h
View file @ 002b27a5
...@@ -29,7 +29,7 @@ void setup_tlb_core_data(void); ...@@ -29,7 +29,7 @@ void setup_tlb_core_data(void);
static inline void setup_tlb_core_data(void) { } static inline void setup_tlb_core_data(void) { }
#endif #endif
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
void exc_lvl_early_init(void); void exc_lvl_early_init(void);
#else #else
static inline void exc_lvl_early_init(void) { } static inline void exc_lvl_early_init(void) { }
......
arch/powerpc/kernel/setup_32.c
View file @ 002b27a5
...@@ -176,7 +176,7 @@ void __init emergency_stack_init(void) ...@@ -176,7 +176,7 @@ void __init emergency_stack_init(void)
} }
#endif #endif
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
void __init exc_lvl_early_init(void) void __init exc_lvl_early_init(void)
{ {
unsigned int i, hw_cpu; unsigned int i, hw_cpu;
......
arch/powerpc/kernel/time.c
View file @ 002b27a5
...@@ -695,7 +695,7 @@ static int __init get_freq(char *name, int cells, unsigned long *val) ...@@ -695,7 +695,7 @@ static int __init get_freq(char *name, int cells, unsigned long *val)
static void start_cpu_decrementer(void) static void start_cpu_decrementer(void)
{ {
#ifdef CONFIG_BOOKE_OR_40x #ifdef CONFIG_BOOKE
unsigned int tcr; unsigned int tcr;
/* Clear any pending timer interrupts */ /* Clear any pending timer interrupts */
......
arch/powerpc/mm/mmu_context.c
View file @ 002b27a5
...@@ -21,7 +21,7 @@ static inline void switch_mm_pgdir(struct task_struct *tsk, ...@@ -21,7 +21,7 @@ static inline void switch_mm_pgdir(struct task_struct *tsk,
#ifdef CONFIG_PPC_BOOK3S_32 #ifdef CONFIG_PPC_BOOK3S_32
tsk->thread.sr0 = mm->context.sr0; tsk->thread.sr0 = mm->context.sr0;
#endif #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; tsk->thread.pid = mm->context.id;
#endif #endif
} }
......
arch/powerpc/mm/nohash/mmu_context.c
View file @ 002b27a5
...@@ -303,7 +303,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next, ...@@ -303,7 +303,7 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next,
if (IS_ENABLED(CONFIG_BDI_SWITCH)) if (IS_ENABLED(CONFIG_BDI_SWITCH))
abatron_pteptrs[1] = next->pgd; abatron_pteptrs[1] = next->pgd;
set_context(id, 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; tsk->thread.pid = id;
#endif #endif
raw_spin_unlock(&context_lock); raw_spin_unlock(&context_lock);
......
arch/powerpc/platforms/Kconfig.cputype
View file @ 002b27a5
...@@ -335,11 +335,6 @@ config BOOKE ...@@ -335,11 +335,6 @@ config BOOKE
depends on PPC_E500 || 44x depends on PPC_E500 || 44x
default y default y
config BOOKE_OR_40x
bool
depends on BOOKE
default y
config PTE_64BIT config PTE_64BIT
bool bool
depends on 44x || PPC_E500 || PPC_86xx depends on 44x || PPC_E500 || PPC_86xx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7