| Message ID | 20230515044543.78903-7-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc: merge _switch in 32/64 | expand |
On Mon May 15, 2023 at 2:45 PM AEST, Nicholas Piggin wrote: > This file contains only the enter_prom implementation now. > Trim includes and update header comment while we're here. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arch/powerpc/kernel/Makefile | 8 +++-- > .../kernel/{entry_64.S => prom_entry_64.S} | 30 ++----------------- > scripts/head-object-list.txt | 2 +- > 3 files changed, 9 insertions(+), 31 deletions(-) > rename arch/powerpc/kernel/{entry_64.S => prom_entry_64.S} (73%) > > diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile > index ec70a1748506..f94c893e014d 100644 > --- a/arch/powerpc/kernel/Makefile > +++ b/arch/powerpc/kernel/Makefile > @@ -209,10 +209,12 @@ CFLAGS_paca.o += -fno-stack-protector > > obj-$(CONFIG_PPC_FPU) += fpu.o > obj-$(CONFIG_ALTIVEC) += vector.o > -obj-$(CONFIG_PPC64) += entry_64.o > -obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o > > -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check > +ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE > +obj-y += prom_init.o > +obj64-y += prom_entry_64.o > +extra-y += prom_init_check > +endif Oops that doesn't work, obj64-y is merged into obj-y before this. Need to move that merge down below here. Thanks, Nick
Le 15/05/2023 à 15:17, Nicholas Piggin a écrit : > On Mon May 15, 2023 at 2:45 PM AEST, Nicholas Piggin wrote: >> This file contains only the enter_prom implementation now. >> Trim includes and update header comment while we're here. >> >> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> >> --- >> arch/powerpc/kernel/Makefile | 8 +++-- >> .../kernel/{entry_64.S => prom_entry_64.S} | 30 ++----------------- >> scripts/head-object-list.txt | 2 +- >> 3 files changed, 9 insertions(+), 31 deletions(-) >> rename arch/powerpc/kernel/{entry_64.S => prom_entry_64.S} (73%) >> >> diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile >> index ec70a1748506..f94c893e014d 100644 >> --- a/arch/powerpc/kernel/Makefile >> +++ b/arch/powerpc/kernel/Makefile >> @@ -209,10 +209,12 @@ CFLAGS_paca.o += -fno-stack-protector >> >> obj-$(CONFIG_PPC_FPU) += fpu.o >> obj-$(CONFIG_ALTIVEC) += vector.o >> -obj-$(CONFIG_PPC64) += entry_64.o >> -obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o >> >> -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check >> +ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE >> +obj-y += prom_init.o >> +obj64-y += prom_entry_64.o >> +extra-y += prom_init_check >> +endif > > Oops that doesn't work, obj64-y is merged into obj-y before this. Need > to move that merge down below here. > > Thanks, > Nick And instead of the ifdef/endif, you can: obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o obj64-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_entry_64.o extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index ec70a1748506..f94c893e014d 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -209,10 +209,12 @@ CFLAGS_paca.o += -fno-stack-protector obj-$(CONFIG_PPC_FPU) += fpu.o obj-$(CONFIG_ALTIVEC) += vector.o -obj-$(CONFIG_PPC64) += entry_64.o -obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init.o -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) += prom_init_check +ifdef CONFIG_PPC_OF_BOOT_TRAMPOLINE +obj-y += prom_init.o +obj64-y += prom_entry_64.o +extra-y += prom_init_check +endif quiet_cmd_prom_init_check = PROMCHK $@ cmd_prom_init_check = $(CONFIG_SHELL) $< "$(NM)" $(obj)/prom_init.o; touch $@ diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/prom_entry_64.S similarity index 73% rename from arch/powerpc/kernel/entry_64.S rename to arch/powerpc/kernel/prom_entry_64.S index f3d3885ee9fd..f1b8793d28c6 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/prom_entry_64.S @@ -10,41 +10,17 @@ * Copyright (C) 1996 Paul Mackerras. * MPC8xx modifications Copyright (C) 1997 Dan Malek (dmalek@jlc.net). * - * This file contains the system call entry code, context switch - * code, and exception/interrupt return code for PowerPC. + * This file contains the 64-bit prom entry code. */ - -#include <linux/errno.h> -#include <linux/err.h> -#include <asm/cache.h> -#include <asm/unistd.h> -#include <asm/processor.h> -#include <asm/page.h> -#include <asm/mmu.h> -#include <asm/thread_info.h> -#include <asm/code-patching-asm.h> -#include <asm/ppc_asm.h> #include <asm/asm-offsets.h> -#include <asm/cputable.h> -#include <asm/firmware.h> -#include <asm/bug.h> -#include <asm/ptrace.h> -#include <asm/irqflags.h> -#include <asm/hw_irq.h> -#include <asm/context_tracking.h> -#include <asm/ppc-opcode.h> -#include <asm/barrier.h> -#include <asm/export.h> -#include <asm/asm-compat.h> #ifdef CONFIG_PPC_BOOK3S #include <asm/exception-64s.h> #else #include <asm/exception-64e.h> #endif -#include <asm/feature-fixups.h> -#include <asm/kup.h> +#include <asm/ppc_asm.h> - .section ".text" +.section ".text","ax",@progbits _GLOBAL(enter_prom) mflr r0 diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt index b2a0e21ea8d7..26359968744e 100644 --- a/scripts/head-object-list.txt +++ b/scripts/head-object-list.txt @@ -34,7 +34,7 @@ arch/powerpc/kernel/head_64.o arch/powerpc/kernel/head_8xx.o arch/powerpc/kernel/head_85xx.o arch/powerpc/kernel/head_book3s_32.o -arch/powerpc/kernel/entry_64.o +arch/powerpc/kernel/prom_entry_64.o arch/powerpc/kernel/fpu.o arch/powerpc/kernel/vector.o arch/powerpc/kernel/prom_init.o
This file contains only the enter_prom implementation now. Trim includes and update header comment while we're here. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/powerpc/kernel/Makefile | 8 +++-- .../kernel/{entry_64.S => prom_entry_64.S} | 30 ++----------------- scripts/head-object-list.txt | 2 +- 3 files changed, 9 insertions(+), 31 deletions(-) rename arch/powerpc/kernel/{entry_64.S => prom_entry_64.S} (73%)