From: Christophe Leroy <christophe.leroy@c-s.fr> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v4 2/2] powerpc/kexec: move kexec files into a dedicated subdir. Date: Tue, 29 Oct 2019 12:13:58 +0000 (UTC) [thread overview] Message-ID: <afbef97ec6a978574a5cf91a4441000e0a9da42a.1572351221.git.christophe.leroy@c-s.fr> (raw) In-Reply-To: <e235973a1198195763afd3b6baffa548a83f4611.1572351221.git.christophe.leroy@c-s.fr> arch/powerpc/kernel/ contains 8 files dedicated to kexec. Move them into a dedicated subdirectory. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- v2: moved crash.c as well as it's part of kexec suite. v3: renamed files to remove 'kexec' keyword from names. v4: removed a ifdef in kexec/Makefile --- arch/powerpc/kernel/Makefile | 19 +--------------- arch/powerpc/kernel/kexec/Makefile | 25 ++++++++++++++++++++++ arch/powerpc/kernel/{ => kexec}/crash.c | 0 .../kernel/{kexec_elf_64.c => kexec/elf_64.c} | 0 arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c} | 0 .../kernel/{machine_kexec.c => kexec/machine.c} | 0 .../{machine_kexec_32.c => kexec/machine_32.c} | 0 .../{machine_kexec_64.c => kexec/machine_64.c} | 0 .../machine_file_64.c} | 0 .../{kexec_relocate_32.S => kexec/relocate_32.S} | 2 +- 10 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 arch/powerpc/kernel/kexec/Makefile rename arch/powerpc/kernel/{ => kexec}/crash.c (100%) rename arch/powerpc/kernel/{kexec_elf_64.c => kexec/elf_64.c} (100%) rename arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c} (100%) rename arch/powerpc/kernel/{machine_kexec.c => kexec/machine.c} (100%) rename arch/powerpc/kernel/{machine_kexec_32.c => kexec/machine_32.c} (100%) rename arch/powerpc/kernel/{machine_kexec_64.c => kexec/machine_64.c} (100%) rename arch/powerpc/kernel/{machine_kexec_file_64.c => kexec/machine_file_64.c} (100%) rename arch/powerpc/kernel/{kexec_relocate_32.S => kexec/relocate_32.S} (99%) diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index ca1a0ffa068d..6f9667e336d4 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -5,9 +5,6 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -# Disable clang warning for using setjmp without setjmp.h header -CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) - ifdef CONFIG_PPC64 CFLAGS_prom_init.o += $(NO_MINIMAL_TOC) endif @@ -83,7 +80,6 @@ obj-y += fadump.o endif ifdef CONFIG_PPC32 obj-$(CONFIG_E500) += idle_e500.o -obj-$(CONFIG_KEXEC_CORE) += kexec_relocate_32.o endif obj-$(CONFIG_PPC_BOOK3S_32) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o @@ -127,14 +123,7 @@ pci64-$(CONFIG_PPC64) += pci_dn.o pci-hotplug.o isa-bridge.o obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \ pci-common.o pci_of_scan.o obj-$(CONFIG_PCI_MSI) += msi.o -obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \ - machine_kexec_$(BITS).o -obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima_kexec.o -endif -endif +obj-$(CONFIG_KEXEC_CORE) += kexec/ obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o @@ -166,12 +155,6 @@ endif GCOV_PROFILE_prom_init.o := n KCOV_INSTRUMENT_prom_init.o := n UBSAN_SANITIZE_prom_init.o := n -GCOV_PROFILE_machine_kexec_64.o := n -KCOV_INSTRUMENT_machine_kexec_64.o := n -UBSAN_SANITIZE_machine_kexec_64.o := n -GCOV_PROFILE_machine_kexec_32.o := n -KCOV_INSTRUMENT_machine_kexec_32.o := n -UBSAN_SANITIZE_machine_kexec_32.o := n GCOV_PROFILE_kprobes.o := n KCOV_INSTRUMENT_kprobes.o := n UBSAN_SANITIZE_kprobes.o := n diff --git a/arch/powerpc/kernel/kexec/Makefile b/arch/powerpc/kernel/kexec/Makefile new file mode 100644 index 000000000000..46e52ee95322 --- /dev/null +++ b/arch/powerpc/kernel/kexec/Makefile @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux kernel. +# + +# Disable clang warning for using setjmp without setjmp.h header +CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) + +obj-y += machine.o crash.o machine_$(BITS).o + +obj-$(CONFIG_PPC32) += relocate_32.o + +obj-$(CONFIG_KEXEC_FILE) += machine_file_$(BITS).o elf_$(BITS).o + +ifdef CONFIG_HAVE_IMA_KEXEC +ifdef CONFIG_IMA +obj-y += ima.o +endif +endif + + +# Disable GCOV, KCOV & sanitizers in odd or sensitive code +GCOV_PROFILE_machine_$(BITS).o := n +KCOV_INSTRUMENT_machine_$(BITS).o := n +UBSAN_SANITIZE_machine_$(BITS).o := n diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/kexec/crash.c similarity index 100% rename from arch/powerpc/kernel/crash.c rename to arch/powerpc/kernel/kexec/crash.c diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec/elf_64.c similarity index 100% rename from arch/powerpc/kernel/kexec_elf_64.c rename to arch/powerpc/kernel/kexec/elf_64.c diff --git a/arch/powerpc/kernel/ima_kexec.c b/arch/powerpc/kernel/kexec/ima.c similarity index 100% rename from arch/powerpc/kernel/ima_kexec.c rename to arch/powerpc/kernel/kexec/ima.c diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/kexec/machine.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec.c rename to arch/powerpc/kernel/kexec/machine.c diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/kexec/machine_32.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_32.c rename to arch/powerpc/kernel/kexec/machine_32.c diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/kexec/machine_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_64.c rename to arch/powerpc/kernel/kexec/machine_64.c diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/kexec/machine_file_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_file_64.c rename to arch/powerpc/kernel/kexec/machine_file_64.c diff --git a/arch/powerpc/kernel/kexec_relocate_32.S b/arch/powerpc/kernel/kexec/relocate_32.S similarity index 99% rename from arch/powerpc/kernel/kexec_relocate_32.S rename to arch/powerpc/kernel/kexec/relocate_32.S index 8a8b4887c879..61946c19e07c 100644 --- a/arch/powerpc/kernel/kexec_relocate_32.S +++ b/arch/powerpc/kernel/kexec/relocate_32.S @@ -32,7 +32,7 @@ relocate_new_kernel: mr r31, r5 #define ENTRY_MAPPING_KEXEC_SETUP -#include "fsl_booke_entry_mapping.S" +#include <kernel/fsl_booke_entry_mapping.S> #undef ENTRY_MAPPING_KEXEC_SETUP mr r3, r29 -- 2.13.3
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@c-s.fr> To: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/2] powerpc/kexec: move kexec files into a dedicated subdir. Date: Tue, 29 Oct 2019 12:13:58 +0000 (UTC) [thread overview] Message-ID: <afbef97ec6a978574a5cf91a4441000e0a9da42a.1572351221.git.christophe.leroy@c-s.fr> (raw) In-Reply-To: <e235973a1198195763afd3b6baffa548a83f4611.1572351221.git.christophe.leroy@c-s.fr> arch/powerpc/kernel/ contains 8 files dedicated to kexec. Move them into a dedicated subdirectory. Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- v2: moved crash.c as well as it's part of kexec suite. v3: renamed files to remove 'kexec' keyword from names. v4: removed a ifdef in kexec/Makefile --- arch/powerpc/kernel/Makefile | 19 +--------------- arch/powerpc/kernel/kexec/Makefile | 25 ++++++++++++++++++++++ arch/powerpc/kernel/{ => kexec}/crash.c | 0 .../kernel/{kexec_elf_64.c => kexec/elf_64.c} | 0 arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c} | 0 .../kernel/{machine_kexec.c => kexec/machine.c} | 0 .../{machine_kexec_32.c => kexec/machine_32.c} | 0 .../{machine_kexec_64.c => kexec/machine_64.c} | 0 .../machine_file_64.c} | 0 .../{kexec_relocate_32.S => kexec/relocate_32.S} | 2 +- 10 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 arch/powerpc/kernel/kexec/Makefile rename arch/powerpc/kernel/{ => kexec}/crash.c (100%) rename arch/powerpc/kernel/{kexec_elf_64.c => kexec/elf_64.c} (100%) rename arch/powerpc/kernel/{ima_kexec.c => kexec/ima.c} (100%) rename arch/powerpc/kernel/{machine_kexec.c => kexec/machine.c} (100%) rename arch/powerpc/kernel/{machine_kexec_32.c => kexec/machine_32.c} (100%) rename arch/powerpc/kernel/{machine_kexec_64.c => kexec/machine_64.c} (100%) rename arch/powerpc/kernel/{machine_kexec_file_64.c => kexec/machine_file_64.c} (100%) rename arch/powerpc/kernel/{kexec_relocate_32.S => kexec/relocate_32.S} (99%) diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index ca1a0ffa068d..6f9667e336d4 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -5,9 +5,6 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -# Disable clang warning for using setjmp without setjmp.h header -CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) - ifdef CONFIG_PPC64 CFLAGS_prom_init.o += $(NO_MINIMAL_TOC) endif @@ -83,7 +80,6 @@ obj-y += fadump.o endif ifdef CONFIG_PPC32 obj-$(CONFIG_E500) += idle_e500.o -obj-$(CONFIG_KEXEC_CORE) += kexec_relocate_32.o endif obj-$(CONFIG_PPC_BOOK3S_32) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o @@ -127,14 +123,7 @@ pci64-$(CONFIG_PPC64) += pci_dn.o pci-hotplug.o isa-bridge.o obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \ pci-common.o pci_of_scan.o obj-$(CONFIG_PCI_MSI) += msi.o -obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \ - machine_kexec_$(BITS).o -obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o -ifdef CONFIG_HAVE_IMA_KEXEC -ifdef CONFIG_IMA -obj-y += ima_kexec.o -endif -endif +obj-$(CONFIG_KEXEC_CORE) += kexec/ obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o @@ -166,12 +155,6 @@ endif GCOV_PROFILE_prom_init.o := n KCOV_INSTRUMENT_prom_init.o := n UBSAN_SANITIZE_prom_init.o := n -GCOV_PROFILE_machine_kexec_64.o := n -KCOV_INSTRUMENT_machine_kexec_64.o := n -UBSAN_SANITIZE_machine_kexec_64.o := n -GCOV_PROFILE_machine_kexec_32.o := n -KCOV_INSTRUMENT_machine_kexec_32.o := n -UBSAN_SANITIZE_machine_kexec_32.o := n GCOV_PROFILE_kprobes.o := n KCOV_INSTRUMENT_kprobes.o := n UBSAN_SANITIZE_kprobes.o := n diff --git a/arch/powerpc/kernel/kexec/Makefile b/arch/powerpc/kernel/kexec/Makefile new file mode 100644 index 000000000000..46e52ee95322 --- /dev/null +++ b/arch/powerpc/kernel/kexec/Makefile @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux kernel. +# + +# Disable clang warning for using setjmp without setjmp.h header +CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) + +obj-y += machine.o crash.o machine_$(BITS).o + +obj-$(CONFIG_PPC32) += relocate_32.o + +obj-$(CONFIG_KEXEC_FILE) += machine_file_$(BITS).o elf_$(BITS).o + +ifdef CONFIG_HAVE_IMA_KEXEC +ifdef CONFIG_IMA +obj-y += ima.o +endif +endif + + +# Disable GCOV, KCOV & sanitizers in odd or sensitive code +GCOV_PROFILE_machine_$(BITS).o := n +KCOV_INSTRUMENT_machine_$(BITS).o := n +UBSAN_SANITIZE_machine_$(BITS).o := n diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/kexec/crash.c similarity index 100% rename from arch/powerpc/kernel/crash.c rename to arch/powerpc/kernel/kexec/crash.c diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec/elf_64.c similarity index 100% rename from arch/powerpc/kernel/kexec_elf_64.c rename to arch/powerpc/kernel/kexec/elf_64.c diff --git a/arch/powerpc/kernel/ima_kexec.c b/arch/powerpc/kernel/kexec/ima.c similarity index 100% rename from arch/powerpc/kernel/ima_kexec.c rename to arch/powerpc/kernel/kexec/ima.c diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/kexec/machine.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec.c rename to arch/powerpc/kernel/kexec/machine.c diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/kexec/machine_32.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_32.c rename to arch/powerpc/kernel/kexec/machine_32.c diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/kexec/machine_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_64.c rename to arch/powerpc/kernel/kexec/machine_64.c diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/kexec/machine_file_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_file_64.c rename to arch/powerpc/kernel/kexec/machine_file_64.c diff --git a/arch/powerpc/kernel/kexec_relocate_32.S b/arch/powerpc/kernel/kexec/relocate_32.S similarity index 99% rename from arch/powerpc/kernel/kexec_relocate_32.S rename to arch/powerpc/kernel/kexec/relocate_32.S index 8a8b4887c879..61946c19e07c 100644 --- a/arch/powerpc/kernel/kexec_relocate_32.S +++ b/arch/powerpc/kernel/kexec/relocate_32.S @@ -32,7 +32,7 @@ relocate_new_kernel: mr r31, r5 #define ENTRY_MAPPING_KEXEC_SETUP -#include "fsl_booke_entry_mapping.S" +#include <kernel/fsl_booke_entry_mapping.S> #undef ENTRY_MAPPING_KEXEC_SETUP mr r3, r29 -- 2.13.3
next prev parent reply other threads:[~2019-10-29 12:14 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-29 12:13 [PATCH v4 1/2] powerpc/32: Split kexec low level code out of misc_32.S Christophe Leroy 2019-10-29 12:13 ` Christophe Leroy 2019-10-29 12:13 ` Christophe Leroy [this message] 2019-10-29 12:13 ` [PATCH v4 2/2] powerpc/kexec: move kexec files into a dedicated subdir Christophe Leroy 2019-11-18 11:23 ` Michael Ellerman 2019-11-18 11:23 ` Michael Ellerman 2019-11-19 17:51 ` Christophe Leroy 2019-11-19 17:51 ` Christophe Leroy 2019-11-25 10:47 ` [PATCH v4 1/2] powerpc/32: Split kexec low level code out of misc_32.S Michael Ellerman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=afbef97ec6a978574a5cf91a4441000e0a9da42a.1572351221.git.christophe.leroy@c-s.fr \ --to=christophe.leroy@c-s.fr \ --cc=benh@kernel.crashing.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.