diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2022-05-06 19:44:01 +0800 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2022-05-07 19:57:35 +0100 |
| commit | 8af6b91f58341325bf74ecb0389ddc0039091d84 (patch) | |
| tree | 7b500461acf7623cf39030f2ff4dec02eb5cdf01 /drivers/of | |
| parent | fb319e77a0e70b9ccfef87827d34b10d6bc2ccce (diff) | |
| download | linux-stable-8af6b91f58341325bf74ecb0389ddc0039091d84.tar.gz linux-stable-8af6b91f58341325bf74ecb0389ddc0039091d84.tar.bz2 linux-stable-8af6b91f58341325bf74ecb0389ddc0039091d84.zip | |
of: Support more than one crash kernel regions for kexec -s
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-tools does 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>
Acked-by: Baoquan He <bhe@redhat.com>
Link: https://lore.kernel.org/r/20220506114402.365-6-thunder.leizhen@huawei.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/kexec.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/of/kexec.c b/drivers/of/kexec.c index b9bd1cff1793..8d374cc552be 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 */ |