Le 06/05/2024 à 14:51, Michael Ellerman a écrit : > Replace 4xx usage with 44x, and replace 4xx_SOC with 44x.
You can go one step further because CONFIG_44x implies CONFIG_BOOKE, see https://patchwork.ozlabs.org/project/linuxppc-dev/patch/d404d1257cd1d36aa6b25237f54eb2c2223ce447.1607519517.git.christophe.le...@csgroup.eu/ > > Signed-off-by: Michael Ellerman <m...@ellerman.id.au> > --- > arch/powerpc/Kconfig | 5 +---- > arch/powerpc/include/asm/cacheflush.h | 2 +- > arch/powerpc/include/asm/ppc_asm.h | 2 +- > arch/powerpc/kernel/entry_32.S | 6 +++--- > arch/powerpc/kernel/process.c | 2 +- > arch/powerpc/mm/fault.c | 4 ++-- > arch/powerpc/mm/ptdump/Makefile | 2 +- > arch/powerpc/platforms/4xx/Makefile | 2 +- > arch/powerpc/platforms/Kconfig.cputype | 8 +------- > arch/powerpc/sysdev/Kconfig | 4 ++-- > 10 files changed, 14 insertions(+), 23 deletions(-) > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 9a7d2b218516..2b6fa87464a5 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -488,7 +488,7 @@ source "kernel/Kconfig.hz" > > config MATH_EMULATION > bool "Math emulation" > - depends on 4xx || PPC_8xx || PPC_MPC832x || BOOKE || PPC_MICROWATT > + depends on 44x || PPC_8xx || PPC_MPC832x || BOOKE || PPC_MICROWATT > select PPC_FPU_REGS > help > Some PowerPC chips designed for embedded applications do not have > @@ -1102,9 +1102,6 @@ config PPC4xx_CPM > It also enables support for two different idle states (idle-wait > and idle-doze). > > -config 4xx_SOC > - bool > - > config FSL_LBC > bool "Freescale Local Bus support" > help > diff --git a/arch/powerpc/include/asm/cacheflush.h > b/arch/powerpc/include/asm/cacheflush.h > index ef7d2de33b89..f2656774aaa9 100644 > --- a/arch/powerpc/include/asm/cacheflush.h > +++ b/arch/powerpc/include/asm/cacheflush.h > @@ -121,7 +121,7 @@ static inline void invalidate_dcache_range(unsigned long > start, > mb(); /* sync */ > } > > -#ifdef CONFIG_4xx > +#ifdef CONFIG_44x > static inline void flush_instruction_cache(void) > { > iccci((void *)KERNELBASE); > diff --git a/arch/powerpc/include/asm/ppc_asm.h > b/arch/powerpc/include/asm/ppc_asm.h > index 1d1018c1e482..02897f4b0dbf 100644 > --- a/arch/powerpc/include/asm/ppc_asm.h > +++ b/arch/powerpc/include/asm/ppc_asm.h > @@ -482,7 +482,7 @@ END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, > CPU_FTR_CELL_TB_BUG, 96) > * and they must be used. > */ > > -#if !defined(CONFIG_4xx) && !defined(CONFIG_PPC_8xx) > +#if !defined(CONFIG_44x) && !defined(CONFIG_PPC_8xx) > #define tlbia \ > li r4,1024; \ > mtctr r4; \ > diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S > index 1522164b10e4..98ad926c056f 100644 > --- a/arch/powerpc/kernel/entry_32.S > +++ b/arch/powerpc/kernel/entry_32.S > @@ -211,7 +211,7 @@ start_kernel_thread: > > .globl fast_exception_return > fast_exception_return: > -#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE)) > +#if !(defined(CONFIG_44x) || defined(CONFIG_BOOKE)) > andi. r10,r9,MSR_RI /* check for recoverable interrupt */ > beq 3f /* if not, we've got problems */ > #endif > @@ -365,7 +365,7 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_STCX_CHECKS_ADDRESS) > rfi > _ASM_NOKPROBE_SYMBOL(interrupt_return) > > -#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) > +#if defined(CONFIG_44x) || defined(CONFIG_BOOKE) > > /* > * Returning from a critical interrupt in user mode doesn't need > @@ -469,4 +469,4 @@ ret_from_mcheck_exc: > RET_FROM_EXC_LEVEL(SPRN_MCSRR0, SPRN_MCSRR1, PPC_RFMCI) > _ASM_NOKPROBE_SYMBOL(ret_from_mcheck_exc) > #endif /* CONFIG_BOOKE */ > -#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */ > +#endif /* !(CONFIG_44x || CONFIG_BOOKE) */ > diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c > index 196cfa41ad6e..cddb4c099bbd 100644 > --- a/arch/powerpc/kernel/process.c > +++ b/arch/powerpc/kernel/process.c > @@ -1566,7 +1566,7 @@ static void __show_regs(struct pt_regs *regs) > if (trap == INTERRUPT_MACHINE_CHECK || > trap == INTERRUPT_DATA_STORAGE || > trap == INTERRUPT_ALIGNMENT) { > - if (IS_ENABLED(CONFIG_4xx) || IS_ENABLED(CONFIG_BOOKE)) > + if (IS_ENABLED(CONFIG_44x) || IS_ENABLED(CONFIG_BOOKE)) > pr_cont("DEAR: "REG" ESR: "REG" ", regs->dear, > regs->esr); > else > pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, > regs->dsisr); > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 53335ae21a40..9af44ddf4b53 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -361,13 +361,13 @@ static void sanity_check_fault(bool is_write, bool > is_user, > * Define the correct "is_write" bit in error_code based > * on the processor family > */ > -#if (defined(CONFIG_4xx) || defined(CONFIG_BOOKE)) > +#if (defined(CONFIG_44x) || defined(CONFIG_BOOKE)) > #define page_fault_is_write(__err) ((__err) & ESR_DST) > #else > #define page_fault_is_write(__err) ((__err) & DSISR_ISSTORE) > #endif > > -#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) > +#if defined(CONFIG_44x) || defined(CONFIG_BOOKE) > #define page_fault_is_bad(__err) (0) > #elif defined(CONFIG_PPC_8xx) > #define page_fault_is_bad(__err) ((__err) & DSISR_NOEXEC_OR_G) > diff --git a/arch/powerpc/mm/ptdump/Makefile b/arch/powerpc/mm/ptdump/Makefile > index dc896d2874f3..0f7a050f327e 100644 > --- a/arch/powerpc/mm/ptdump/Makefile > +++ b/arch/powerpc/mm/ptdump/Makefile > @@ -2,7 +2,7 @@ > > obj-y += ptdump.o > > -obj-$(CONFIG_4xx) += shared.o > +obj-$(CONFIG_44x) += shared.o > obj-$(CONFIG_PPC_8xx) += 8xx.o > obj-$(CONFIG_PPC_E500) += shared.o > obj-$(CONFIG_PPC_BOOK3S_32) += shared.o > diff --git a/arch/powerpc/platforms/4xx/Makefile > b/arch/powerpc/platforms/4xx/Makefile > index 2071a0abe09b..7f57c35f8dec 100644 > --- a/arch/powerpc/platforms/4xx/Makefile > +++ b/arch/powerpc/platforms/4xx/Makefile > @@ -1,6 +1,6 @@ > # SPDX-License-Identifier: GPL-2.0-only > obj-y += uic.o machine_check.o > -obj-$(CONFIG_4xx_SOC) += soc.o > +obj-$(CONFIG_44x) += soc.o > obj-$(CONFIG_PCI) += pci.o > obj-$(CONFIG_PPC4xx_HSTA_MSI) += hsta_msi.o > obj-$(CONFIG_PPC4xx_CPM) += cpm.o > diff --git a/arch/powerpc/platforms/Kconfig.cputype > b/arch/powerpc/platforms/Kconfig.cputype > index 55337628bf92..ce1ff72dc537 100644 > --- a/arch/powerpc/platforms/Kconfig.cputype > +++ b/arch/powerpc/platforms/Kconfig.cputype > @@ -47,7 +47,6 @@ config 44x > bool "AMCC 44x, 46x or 47x" > select PPC_DCR_NATIVE > select PPC_UDBG_16550 > - select 4xx_SOC > select HAVE_PCI > select PHYS_64BIT > select PPC_KUEP > @@ -325,11 +324,6 @@ config FSL_EMB_PERF_EVENT_E500 > depends on FSL_EMB_PERF_EVENT && PPC_E500 > default y > > -config 4xx > - bool > - depends on 44x > - default y > - > config BOOKE > bool > depends on PPC_E500 || 44x > @@ -564,7 +558,7 @@ config NR_CPUS > > config NOT_COHERENT_CACHE > bool > - depends on 4xx || PPC_8xx || PPC_MPC512x || \ > + depends on 44x || PPC_8xx || PPC_MPC512x || \ > GAMECUBE_COMMON || AMIGAONE > select ARCH_HAS_DMA_PREP_COHERENT > select ARCH_HAS_SYNC_DMA_FOR_DEVICE > diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig > index 5aa92ff3622d..18ff2c4a814a 100644 > --- a/arch/powerpc/sysdev/Kconfig > +++ b/arch/powerpc/sysdev/Kconfig > @@ -5,12 +5,12 @@ > > config PPC4xx_PCI_EXPRESS > bool > - depends on PCI && 4xx > + depends on PCI && 44x > > config PPC4xx_HSTA_MSI > bool > depends on PCI_MSI > - depends on PCI && 4xx > + depends on PCI && 44x > > config PPC_MSI_BITMAP > bool
