From: Pavel Tatashin <pasha.tatashin@soleen.com>
To: pasha.tatashin@soleen.com, jmorris@namei.org, sashal@kernel.org,
ebiederm@xmission.com, kexec@lists.infradead.org,
linux-kernel@vger.kernel.org, corbet@lwn.net,
catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org, marc.zyngier@arm.com,
james.morse@arm.com, vladimir.murzin@arm.com,
matthias.bgg@gmail.com, bhsharma@redhat.com, linux-mm@kvack.org,
mark.rutland@arm.com, steve.capper@arm.com, rfontana@redhat.com,
tglx@linutronix.de
Subject: [PATCH v7 04/25] arm64: kexec: make dtb_mem always enabled
Date: Wed, 16 Oct 2019 16:00:13 -0400 [thread overview]
Message-ID: <20191016200034.1342308-5-pasha.tatashin@soleen.com> (raw)
In-Reply-To: <20191016200034.1342308-1-pasha.tatashin@soleen.com>
Currently, dtb_mem is enabled only when CONFIG_KEXEC_FILE is
enabled. This adds ugly ifdefs to c files.
Always enabled dtb_mem, when it is not used, it is NULL.
Change the dtb_mem to phys_addr_t, as it is a physical address.
Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
---
arch/arm64/include/asm/kexec.h | 4 ++--
arch/arm64/kernel/machine_kexec.c | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 12a561a54128..ad6afed69078 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -90,14 +90,14 @@ static inline void crash_prepare_suspend(void) {}
static inline void crash_post_resume(void) {}
#endif
-#ifdef CONFIG_KEXEC_FILE
#define ARCH_HAS_KIMAGE_ARCH
struct kimage_arch {
void *dtb;
- unsigned long dtb_mem;
+ phys_addr_t dtb_mem;
};
+#ifdef CONFIG_KEXEC_FILE
extern const struct kexec_file_ops kexec_image_ops;
struct kimage;
diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
index 8e9c924423b4..ae1bad0156cd 100644
--- a/arch/arm64/kernel/machine_kexec.c
+++ b/arch/arm64/kernel/machine_kexec.c
@@ -203,11 +203,7 @@ void machine_kexec(struct kimage *kimage)
* In kexec_file case, the kernel starts directly without purgatory.
*/
cpu_soft_restart(reboot_code_buffer_phys, kimage->head, kimage->start,
-#ifdef CONFIG_KEXEC_FILE
- kimage->arch.dtb_mem);
-#else
- 0);
-#endif
+ kimage->arch.dtb_mem);
BUG(); /* Should never get here. */
}
--
2.23.0
next prev parent reply other threads:[~2019-10-16 20:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 20:00 [PATCH v7 00/25] arm64: MMU enabled kexec relocation Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 01/25] kexec: quiet down kexec reboot Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 02/25] kexec: add machine_kexec_post_load() Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 03/25] arm64: kexec: remove unnecessary debug prints Pavel Tatashin
2019-10-16 20:00 ` Pavel Tatashin [this message]
2019-10-16 20:00 ` [PATCH v7 05/25] arm64: hibernate: pass the allocated pgdp to ttbr0 Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 06/25] arm64: hibernate: use get_safe_page directly Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 07/25] arm64: hibernate: remove gotos as they are not needed Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 08/25] arm64: hibernate: rename dst to page in create_safe_exec_page Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 09/25] arm64: hibernate: add PUD_SECT_RDONLY Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 10/25] arm64: hibernate: add trans_pgd public functions Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 11/25] arm64: hibernate: move page handling function to new trans_pgd.c Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 12/25] arm64: trans_pgd: make trans_pgd_map_page generic Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 13/25] arm64: trans_pgd: pass allocator trans_pgd_create_copy Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 14/25] arm64: trans_pgd: pass NULL instead of init_mm to *_populate functions Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 15/25] arm64: kexec: move relocation function setup Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 16/25] arm64: kexec: call kexec_image_info only once Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 17/25] arm64: kexec: cpu_soft_restart change argument types Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 18/25] arm64: kexec: arm64_relocate_new_kernel clean-ups Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 19/25] arm64: kexec: arm64_relocate_new_kernel don't use x0 as temp Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 20/25] arm64: kexec: add expandable argument to relocation function Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 21/25] arm64: kexec: offset for " Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 22/25] arm64: kexec: kexec EL2 vectors Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 23/25] arm64: kexec: configure trans_pgd page table for kexec Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 24/25] arm64: kexec: enable MMU during kexec relocation Pavel Tatashin
2019-10-16 20:00 ` [PATCH v7 25/25] arm64: kexec: remove head from relocation argument Pavel Tatashin
2019-10-17 14:26 ` [PATCH v7 00/25] arm64: MMU enabled kexec relocation Pavel Tatashin
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=20191016200034.1342308-5-pasha.tatashin@soleen.com \
--to=pasha.tatashin@soleen.com \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=ebiederm@xmission.com \
--cc=james.morse@arm.com \
--cc=jmorris@namei.org \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=rfontana@redhat.com \
--cc=sashal@kernel.org \
--cc=steve.capper@arm.com \
--cc=tglx@linutronix.de \
--cc=vladimir.murzin@arm.com \
--cc=will@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).