lkml.org 
[lkml]   [2021]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v18 02/17] x86/setup: Move xen_pv_domain() check and insert_resource() to setup_arch()
    Date
    From: Chen Zhou <chenzhou10@huawei.com>

    We will make the functions reserve_crashkernel() as generic, the
    xen_pv_domain() check in reserve_crashkernel() is relevant only to
    x86, the same as insert_resource() in reserve_crashkernel[_low]().
    So move xen_pv_domain() check and insert_resource() to setup_arch()
    to keep them in x86.

    Suggested-by: Mike Rapoport <rppt@kernel.org>
    Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
    Co-developed-by: Zhen Lei <thunder.leizhen@huawei.com>
    Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
    ---
    arch/x86/kernel/setup.c | 23 +++++++++++------------
    1 file changed, 11 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
    index ae8f63661363e25..acf2f2eedfe3415 100644
    --- a/arch/x86/kernel/setup.c
    +++ b/arch/x86/kernel/setup.c
    @@ -434,7 +434,6 @@ static int __init reserve_crashkernel_low(void)

    crashk_low_res.start = low_base;
    crashk_low_res.end = low_base + low_size - 1;
    - insert_resource(&iomem_resource, &crashk_low_res);
    #endif
    return 0;
    }
    @@ -458,11 +457,6 @@ static void __init reserve_crashkernel(void)
    high = true;
    }

    - if (xen_pv_domain()) {
    - pr_info("Ignoring crashkernel for a Xen PV domain\n");
    - return;
    - }
    -
    /* 0 means: find the address automatically */
    if (!crash_base) {
    /*
    @@ -508,11 +502,6 @@ static void __init reserve_crashkernel(void)

    crashk_res.start = crash_base;
    crashk_res.end = crash_base + crash_size - 1;
    - insert_resource(&iomem_resource, &crashk_res);
    -}
    -#else
    -static void __init reserve_crashkernel(void)
    -{
    }
    #endif

    @@ -1120,7 +1109,17 @@ void __init setup_arch(char **cmdline_p)
    * Reserve memory for crash kernel after SRAT is parsed so that it
    * won't consume hotpluggable memory.
    */
    - reserve_crashkernel();
    +#ifdef CONFIG_KEXEC_CORE
    + if (xen_pv_domain())
    + pr_info("Ignoring crashkernel for a Xen PV domain\n");
    + else {
    + reserve_crashkernel();
    + if (crashk_res.end > crashk_res.start)
    + insert_resource(&iomem_resource, &crashk_res);
    + if (crashk_low_res.end > crashk_low_res.start)
    + insert_resource(&iomem_resource, &crashk_low_res);
    + }
    +#endif

    memblock_find_dma_reserve();

    --
    2.25.1
    \
     
     \ /
      Last update: 2021-12-22 14:12    [W:2.591 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site