lkml.org 
[lkml]   [2007]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 5/7] Use extended crashkernel command line on ppc64
    This patch adapts the ppc64 code to use the generic parse_crashkernel()
    function introduced in the generic patch of that series.


    Signed-off-by: Bernhard Walle <bwalle@suse.de>

    ---
    arch/powerpc/kernel/machine_kexec.c | 52 ++++++++++++++++++------------------
    1 file changed, 26 insertions(+), 26 deletions(-)

    --- a/arch/powerpc/kernel/machine_kexec.c
    +++ b/arch/powerpc/kernel/machine_kexec.c
    @@ -61,45 +61,39 @@ NORET_TYPE void machine_kexec(struct kim
    for(;;);
    }

    -static int __init early_parse_crashk(char *p)
    +void __init reserve_crashkernel(void)
    {
    - unsigned long size;
    -
    - if (!p)
    - return 1;
    -
    - size = memparse(p, &p);
    + unsigned long long crash_size = 0, crash_base;
    + int ret;

    - if (*p == '@')
    - crashk_res.start = memparse(p + 1, &p);
    - else
    - crashk_res.start = KDUMP_KERNELBASE;
    -
    - crashk_res.end = crashk_res.start + size - 1;
    -
    - return 0;
    -}
    -early_param("crashkernel", early_parse_crashk);
    + /* this is necessary because of lmb_phys_mem_size() */
    + lmb_analyze();

    -void __init reserve_crashkernel(void)
    -{
    - unsigned long size;
    + /* use common parsing */
    + ret = parse_crashkernel(boot_command_line, lmb_phys_mem_size(),
    + &crash_size, &crash_base);
    + if (ret == 0 && crash_size > 0) {
    + if (crash_base == 0)
    + crash_base = KDUMP_KERNELBASE;
    + crashk_res.start = crash_base;
    + } else {
    + /* handle the device tree */
    + crash_size = crashk_res.end - crashk_res.start + 1;
    + }

    - if (crashk_res.start == 0)
    + if (crash_size == 0)
    return;

    /* We might have got these values via the command line or the
    * device tree, either way sanitise them now. */

    - size = crashk_res.end - crashk_res.start + 1;
    -
    if (crashk_res.start != KDUMP_KERNELBASE)
    printk("Crash kernel location must be 0x%x\n",
    KDUMP_KERNELBASE);

    crashk_res.start = KDUMP_KERNELBASE;
    - size = PAGE_ALIGN(size);
    - crashk_res.end = crashk_res.start + size - 1;
    + crash_size = PAGE_ALIGN(crash_size);
    + crashk_res.end = crashk_res.start + crash_size - 1;

    /* Crash kernel trumps memory limit */
    if (memory_limit && memory_limit <= crashk_res.end) {
    @@ -108,7 +102,13 @@ void __init reserve_crashkernel(void)
    memory_limit);
    }

    - lmb_reserve(crashk_res.start, size);
    + printk(KERN_INFO "Reserving %ldMB of memory at %ldMB "
    + "for crashkernel (System RAM: %ldMB)\n",
    + (unsigned long)(crash_size >> 20),
    + (unsigned long)(crashk_res.start >> 20),
    + (unsigned long)(lmb_phys_mem_size() >> 20));
    +
    + lmb_reserve(crashk_res.start, crash_size);
    }

    int overlaps_crashkernel(unsigned long start, unsigned long size)
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-13 18:19    [W:0.023 / U:29.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site