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 09/11] of: fdt: Aggregate the processing of "linux,usable-memory-range"
Date: Tue, 23 Nov 2021 20:46:44 +0800 [thread overview]
Message-ID: <20211123124646.1995-10-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20211123124646.1995-1-thunder.leizhen@huawei.com>
Currently, we parse the "linux,usable-memory-range" property in
early_init_dt_scan_chosen(), to obtain the specified memory range of the
crash kernel. We then reserve the required memory after
early_init_dt_scan_memory() has identified all available physical memory.
Because the two pieces of code are separated far, the readability and
maintainability are reduced. So bring them together.
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/of/fdt.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index bdca35284cebd56..37b477a51175359 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -965,8 +965,7 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)
elfcorehdr_addr, elfcorehdr_size);
}
-static phys_addr_t cap_mem_addr;
-static phys_addr_t cap_mem_size;
+static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;
/**
* early_init_dt_check_for_usable_mem_range - Decode usable memory range
@@ -977,6 +976,11 @@ static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)
{
const __be32 *prop;
int len;
+ phys_addr_t cap_mem_addr;
+ phys_addr_t cap_mem_size;
+
+ if ((long)node < 0)
+ return;
pr_debug("Looking for usable-memory-range property... ");
@@ -989,6 +993,8 @@ static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)
pr_debug("cap_mem_start=%pa cap_mem_size=%pa\n", &cap_mem_addr,
&cap_mem_size);
+
+ memblock_cap_memory_range(cap_mem_addr, cap_mem_size);
}
#ifdef CONFIG_SERIAL_EARLYCON
@@ -1137,9 +1143,10 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,
(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))
return 0;
+ chosen_node_offset = node;
+
early_init_dt_check_for_initrd(node);
early_init_dt_check_for_elfcorehdr(node);
- early_init_dt_check_for_usable_mem_range(node);
/* Retrieve command line */
p = of_get_flat_dt_prop(node, "bootargs", &l);
@@ -1275,7 +1282,7 @@ void __init early_init_dt_scan_nodes(void)
of_scan_flat_dt(early_init_dt_scan_memory, NULL);
/* Handle linux,usable-memory-range property */
- memblock_cap_memory_range(cap_mem_addr, cap_mem_size);
+ early_init_dt_check_for_usable_mem_range(chosen_node_offset);
}
bool __init early_init_dt_scan(void *params)
--
2.25.1
next prev parent reply other threads:[~2021-11-23 12:50 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 ` [PATCH v16 06/11] arm64: kdump: introduce some macros for crash kernel reservation Zhen Lei
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 ` Zhen Lei [this message]
2021-11-30 22:05 ` [PATCH v16 09/11] of: fdt: Aggregate the processing of "linux,usable-memory-range" 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-10-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).