lkml.org 
[lkml]   [2021]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 01/18] arm64: kexec: make dtb_mem always enabled
    Date
    Currently, dtb_mem is enabled only when CONFIG_KEXEC_FILE is
    enabled. This adds ugly ifdefs to c files.

    Always enabled dtb_mem, when it is not used, it is NULL.
    Change the dtb_mem to phys_addr_t, as it is a physical address.

    Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
    Reviewed-by: James Morse <james.morse@arm.com>
    ---
    arch/arm64/include/asm/kexec.h | 4 ++--
    arch/arm64/kernel/machine_kexec.c | 6 +-----
    2 files changed, 3 insertions(+), 7 deletions(-)

    diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
    index d24b527e8c00..61530ec3a9b1 100644
    --- a/arch/arm64/include/asm/kexec.h
    +++ b/arch/arm64/include/asm/kexec.h
    @@ -90,18 +90,18 @@ static inline void crash_prepare_suspend(void) {}
    static inline void crash_post_resume(void) {}
    #endif

    -#ifdef CONFIG_KEXEC_FILE
    #define ARCH_HAS_KIMAGE_ARCH

    struct kimage_arch {
    void *dtb;
    - unsigned long dtb_mem;
    + phys_addr_t dtb_mem;
    /* Core ELF header buffer */
    void *elf_headers;
    unsigned long elf_headers_mem;
    unsigned long elf_headers_sz;
    };

    +#ifdef CONFIG_KEXEC_FILE
    extern const struct kexec_file_ops kexec_image_ops;

    struct kimage;
    diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c
    index a0b144cfaea7..8096a6aa1d49 100644
    --- a/arch/arm64/kernel/machine_kexec.c
    +++ b/arch/arm64/kernel/machine_kexec.c
    @@ -204,11 +204,7 @@ void machine_kexec(struct kimage *kimage)
    * In kexec_file case, the kernel starts directly without purgatory.
    */
    cpu_soft_restart(reboot_code_buffer_phys, kimage->head, kimage->start,
    -#ifdef CONFIG_KEXEC_FILE
    - kimage->arch.dtb_mem);
    -#else
    - 0);
    -#endif
    + kimage->arch.dtb_mem);

    BUG(); /* Should never get here. */
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2021-01-26 11:16    [W:4.898 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site