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>,
"John Donnelly" <John.p.donnelly@oracle.com>,
Dave Kleikamp <dave.kleikamp@oracle.com>
Subject: [PATCH v24 5/6] of: Support more than one crash kernel regions for kexec -s
Date: Fri, 6 May 2022 19:44:01 +0800 [thread overview]
Message-ID: <20220506114402.365-6-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20220506114402.365-1-thunder.leizhen@huawei.com>
When "crashkernel=X,high" is used, there may be two crash regions:
high=crashk_res and low=crashk_low_res. But now the syscall
kexec_file_load() only add crashk_res into "linux,usable-memory-range",
this may cause the second kernel to have no available dma memory.
Fix it like kexec tool do for option -c, add both 'high' and 'low' regions
into the dtb.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Acked-by: Rob Herring <robh@kernel.org>
---
drivers/of/kexec.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c
index b9bd1cff179388c..8d374cc552be5f2 100644
--- a/drivers/of/kexec.c
+++ b/drivers/of/kexec.c
@@ -386,6 +386,15 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,
crashk_res.end - crashk_res.start + 1);
if (ret)
goto out;
+
+ if (crashk_low_res.end) {
+ ret = fdt_appendprop_addrrange(fdt, 0, chosen_node,
+ "linux,usable-memory-range",
+ crashk_low_res.start,
+ crashk_low_res.end - crashk_low_res.start + 1);
+ if (ret)
+ goto out;
+ }
}
/* add bootargs */
--
2.25.1
next prev parent reply other threads:[~2022-05-06 11:45 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-06 11:43 [PATCH v24 0/6] support reserving crashkernel above 4G on arm64 kdump Zhen Lei
2022-05-06 11:43 ` [PATCH v24 1/6] kdump: return -ENOENT if required cmdline option does not exist Zhen Lei
2022-05-06 11:43 ` [PATCH v24 2/6] arm64: Use insert_resource() to simplify code Zhen Lei
2022-05-06 11:43 ` [PATCH v24 3/6] arm64: kdump: Reimplement crashkernel=X Zhen Lei
2022-05-06 23:10 ` Baoquan He
2022-05-07 1:34 ` Leizhen (ThunderTown)
2022-05-07 2:07 ` Baoquan He
2022-05-07 3:37 ` Leizhen (ThunderTown)
2022-05-07 9:35 ` Leizhen (ThunderTown)
2022-05-07 11:49 ` Leizhen (ThunderTown)
2022-05-07 12:20 ` Leizhen (ThunderTown)
2022-05-07 13:22 ` Baoquan He
2022-05-07 17:30 ` John Donnelly
2022-05-07 18:50 ` Catalin Marinas
2022-05-09 4:04 ` Baoquan He
2022-05-06 11:44 ` [PATCH v24 4/6] of: fdt: Add memory for devices by DT property "linux,usable-memory-range" Zhen Lei
2022-05-06 23:15 ` Baoquan He
2022-05-06 11:44 ` Zhen Lei [this message]
2022-05-06 23:17 ` [PATCH v24 5/6] of: Support more than one crash kernel regions for kexec -s Baoquan He
2022-05-07 1:42 ` Leizhen (ThunderTown)
2022-05-07 2:36 ` Baoquan He
2022-05-06 11:44 ` [PATCH v24 6/6] docs: kdump: Update the crashkernel description for arm64 Zhen Lei
2022-05-06 23:14 ` Baoquan He
2022-05-07 1:41 ` Leizhen (ThunderTown)
2022-05-07 3:23 ` Leizhen (ThunderTown)
2022-05-07 3:30 ` Baoquan He
2022-05-07 18:22 ` Catalin Marinas
2022-05-09 4:05 ` Baoquan He
2022-05-07 19:12 ` [PATCH v24 0/6] support reserving crashkernel above 4G on arm64 kdump 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=20220506114402.365-6-thunder.leizhen@huawei.com \
--to=thunder.leizhen@huawei.com \
--cc=John.p.donnelly@oracle.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=dave.kleikamp@oracle.com \
--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).