powerpc/purgatory: Omit use of bin2c
The .incbin assembler directive is much faster than bin2c + $(CC).
Do similar refactoring as in commit 4c0f032d49
("s390/purgatory:
Omit use of bin2c").
Please note the .quad directive matches to size_t in C (both 8 byte)
because the purgatory is compiled only for the 64-bit kernel.
(KEXEC_FILE depends on PPC64).
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220725015619.618070-1-masahiroy@kernel.org
This commit is contained in:
Родитель
118b136693
Коммит
9257971377
|
@ -553,7 +553,6 @@ config KEXEC_FILE
|
||||||
bool "kexec file based system call"
|
bool "kexec file based system call"
|
||||||
select KEXEC_CORE
|
select KEXEC_CORE
|
||||||
select HAVE_IMA_KEXEC if IMA
|
select HAVE_IMA_KEXEC if IMA
|
||||||
select BUILD_BIN2C
|
|
||||||
select KEXEC_ELF
|
select KEXEC_ELF
|
||||||
depends on PPC64
|
depends on PPC64
|
||||||
depends on CRYPTO=y
|
depends on CRYPTO=y
|
||||||
|
|
|
@ -1,3 +1,2 @@
|
||||||
# SPDX-License-Identifier: GPL-2.0-only
|
# SPDX-License-Identifier: GPL-2.0-only
|
||||||
kexec-purgatory.c
|
|
||||||
purgatory.ro
|
purgatory.ro
|
||||||
|
|
|
@ -2,17 +2,13 @@
|
||||||
|
|
||||||
KASAN_SANITIZE := n
|
KASAN_SANITIZE := n
|
||||||
|
|
||||||
targets += trampoline_$(BITS).o purgatory.ro kexec-purgatory.c
|
targets += trampoline_$(BITS).o purgatory.ro
|
||||||
|
|
||||||
LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined
|
LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined
|
||||||
|
|
||||||
$(obj)/purgatory.ro: $(obj)/trampoline_$(BITS).o FORCE
|
$(obj)/purgatory.ro: $(obj)/trampoline_$(BITS).o FORCE
|
||||||
$(call if_changed,ld)
|
$(call if_changed,ld)
|
||||||
|
|
||||||
quiet_cmd_bin2c = BIN2C $@
|
$(obj)/kexec-purgatory.o: $(obj)/purgatory.ro
|
||||||
cmd_bin2c = $(objtree)/scripts/bin2c kexec_purgatory < $< > $@
|
|
||||||
|
|
||||||
$(obj)/kexec-purgatory.c: $(obj)/purgatory.ro FORCE
|
|
||||||
$(call if_changed,bin2c)
|
|
||||||
|
|
||||||
obj-y += kexec-purgatory.o
|
obj-y += kexec-purgatory.o
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
|
|
||||||
|
.section .rodata, "a"
|
||||||
|
|
||||||
|
.align 8
|
||||||
|
kexec_purgatory:
|
||||||
|
.globl kexec_purgatory
|
||||||
|
.incbin "arch/powerpc/purgatory/purgatory.ro"
|
||||||
|
.Lkexec_purgatory_end:
|
||||||
|
|
||||||
|
.align 8
|
||||||
|
kexec_purgatory_size:
|
||||||
|
.globl kexec_purgatory_size
|
||||||
|
.quad .Lkexec_purgatory_end - kexec_purgatory
|
|
@ -20,6 +20,8 @@ set -e
|
||||||
# yard. Stale files stay in this file for a while (for some release cycles?),
|
# yard. Stale files stay in this file for a while (for some release cycles?),
|
||||||
# then will be really dead and removed from the code base entirely.
|
# then will be really dead and removed from the code base entirely.
|
||||||
|
|
||||||
|
rm -f arch/powerpc/purgatory/kexec-purgatory.c
|
||||||
|
|
||||||
# These were previously generated source files. When you are building the kernel
|
# These were previously generated source files. When you are building the kernel
|
||||||
# with O=, make sure to remove the stale files in the output tree. Otherwise,
|
# with O=, make sure to remove the stale files in the output tree. Otherwise,
|
||||||
# the build system wrongly compiles the stale ones.
|
# the build system wrongly compiles the stale ones.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче