From: Zhen Lei <thunder.leizhen@huawei.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
<x86@kernel.org>, "H . Peter Anvin" <hpa@zytor.com>,
<linux-kernel@vger.kernel.org>, Dave Young <dyoung@redhat.com>,
Baoquan He <bhe@redhat.com>, Vivek Goyal <vgoyal@redhat.com>,
Eric Biederman <ebiederm@xmission.com>,
<kexec@lists.infradead.org>,
Catalin Marinas <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
<devicetree@vger.kernel.org>, Jonathan Corbet <corbet@lwn.net>,
<linux-doc@vger.kernel.org>
Cc: Zhen Lei <thunder.leizhen@huawei.com>,
Randy Dunlap <rdunlap@infradead.org>,
Feng Zhou <zhoufeng.zf@bytedance.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Chen Zhou <dingguo.cz@antgroup.com>
Subject: [PATCH v16 06/11] arm64: kdump: introduce some macros for crash kernel reservation
Date: Tue, 23 Nov 2021 20:46:41 +0800 [thread overview]
Message-ID: <20211123124646.1995-7-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20211123124646.1995-1-thunder.leizhen@huawei.com>
From: Chen Zhou <chenzhou10@huawei.com>
Introduce macro CRASH_ALIGN for alignment, macro CRASH_ADDR_LOW_MAX
for upper bound of low crash memory, macro CRASH_ADDR_HIGH_MAX for
upper bound of high crash memory, use macros instead.
Besides, keep consistent with x86, use CRASH_ALIGN as the lower bound
of crash kernel reservation.
Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Tested-by: John Donnelly <John.p.donnelly@oracle.com>
---
arch/arm64/include/asm/kexec.h | 6 ++++++
arch/arm64/mm/init.c | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 9839bfc163d7147..1b9edc69f0244ca 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -25,6 +25,12 @@
#define KEXEC_ARCH KEXEC_ARCH_AARCH64
+/* 2M alignment for crash kernel regions */
+#define CRASH_ALIGN SZ_2M
+
+#define CRASH_ADDR_LOW_MAX arm64_dma_phys_limit
+#define CRASH_ADDR_HIGH_MAX MEMBLOCK_ALLOC_ACCESSIBLE
+
#ifndef __ASSEMBLY__
/**
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index a8834434af99ae0..be4595dc7459115 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -75,7 +75,7 @@ phys_addr_t arm64_dma_phys_limit __ro_after_init;
static void __init reserve_crashkernel(void)
{
unsigned long long crash_base, crash_size;
- unsigned long long crash_max = arm64_dma_phys_limit;
+ unsigned long long crash_max = CRASH_ADDR_LOW_MAX;
int ret;
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
@@ -91,7 +91,7 @@ static void __init reserve_crashkernel(void)
crash_max = crash_base + crash_size;
/* Current arm64 boot protocol requires 2MB alignment */
- crash_base = memblock_phys_alloc_range(crash_size, SZ_2M,
+ crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
crash_base, crash_max);
if (!crash_base) {
pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
--
2.25.1
next prev parent reply other threads:[~2021-11-23 12:49 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-23 12:46 [PATCH v16 00/11] support reserving crashkernel above 4G on arm64 kdump Zhen Lei
2021-11-23 12:46 ` [PATCH v16 01/11] x86: kdump: replace the hard-coded alignment with macro CRASH_ALIGN Zhen Lei
2021-11-23 12:46 ` [PATCH v16 02/11] x86: kdump: make the lower bound of crash kernel reservation consistent Zhen Lei
2021-11-23 12:46 ` [PATCH v16 03/11] x86: kdump: use macro CRASH_ADDR_LOW_MAX in functions reserve_crashkernel() Zhen Lei
2021-11-23 12:46 ` [PATCH v16 04/11] x86: kdump: move xen_pv_domain() check and insert_resource() to setup_arch() Zhen Lei
2021-11-23 12:46 ` [PATCH v16 05/11] x86: kdump: move reserve_crashkernel[_low]() into crash_core.c Zhen Lei
2021-11-23 12:46 ` Zhen Lei [this message]
2021-11-23 12:46 ` [PATCH v16 07/11] arm64: kdump: reimplement crashkernel=X Zhen Lei
2021-11-23 12:46 ` [PATCH v16 08/11] x86, arm64: Add ARCH_WANT_RESERVE_CRASH_KERNEL config Zhen Lei
2021-12-08 17:09 ` Catalin Marinas
2021-12-09 2:06 ` Leizhen (ThunderTown)
2021-11-23 12:46 ` [PATCH v16 09/11] of: fdt: Aggregate the processing of "linux,usable-memory-range" Zhen Lei
2021-11-30 22:05 ` Rob Herring
2021-11-23 12:46 ` [PATCH v16 10/11] of: fdt: Add memory for devices by DT property "linux,usable-memory-range" Zhen Lei
2021-11-30 22:16 ` Rob Herring
2021-12-01 2:55 ` Leizhen (ThunderTown)
2021-12-09 1:59 ` Leizhen (ThunderTown)
2021-12-09 17:40 ` Rob Herring
2021-11-23 12:46 ` [PATCH v16 11/11] kdump: update Documentation about crashkernel Zhen Lei
2021-11-29 20:25 ` [PATCH v16 00/11] support reserving crashkernel above 4G on arm64 kdump Dave Kleikamp
2021-11-30 2:12 ` Baoquan He
2021-12-06 3:51 ` john.p.donnelly
2021-12-08 17:13 ` Catalin Marinas
2021-12-10 19:53 ` john.p.donnelly
2021-12-13 10:18 ` Catalin Marinas
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=20211123124646.1995-7-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=devicetree@vger.kernel.org \
--cc=dingguo.cz@antgroup.com \
--cc=dyoung@redhat.com \
--cc=ebiederm@xmission.com \
--cc=frowand.list@gmail.com \
--cc=hpa@zytor.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
--cc=vgoyal@redhat.com \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=zhoufeng.zf@bytedance.com \
/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).