lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 120/772] of: Support more than one crash kernel regions for kexec -s
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit 8af6b91f58341325bf74ecb0389ddc0039091d84 ]

    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>
    Signed-off-by: Sasha Levin <sashal@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 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 */
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 22:46    [W:3.459 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site