From: Hari Bathini Date: Wed, 11 Sep 2019 14:46:52 +0000 (+0530) Subject: powerpc/fadump: declare helper functions in internal header file X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f0ad11d3fb948a0d7770bd38ae17a51413c3dac;p=openwrt%2Fstaging%2Fblogic.git powerpc/fadump: declare helper functions in internal header file Declare helper functions, that can be reused by multiple platforms, in the internal header file. Signed-off-by: Hari Bathini Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/156821320487.5656.2660730464212209984.stgit@hbathini.in.ibm.com --- diff --git a/arch/powerpc/include/asm/fadump-internal.h b/arch/powerpc/include/asm/fadump-internal.h index 16e2781a3e48..e004c89570b0 100644 --- a/arch/powerpc/include/asm/fadump-internal.h +++ b/arch/powerpc/include/asm/fadump-internal.h @@ -83,4 +83,12 @@ struct fw_dump { unsigned long nocma:1; }; +/* Helper functions */ +s32 fadump_setup_cpu_notes_buf(u32 num_cpus); +void fadump_free_cpu_notes_buf(void); +u32 *fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs); +void fadump_update_elfcore_header(char *bufp); +bool is_fadump_boot_mem_contiguous(void); +bool is_fadump_reserved_mem_contiguous(void); + #endif /* _ASM_POWERPC_FADUMP_INTERNAL_H */ diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index e2b83a991303..eb0745e418db 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -234,7 +234,7 @@ static bool is_fadump_mem_area_contiguous(u64 d_start, u64 d_end) * Returns true, if there are no holes in boot memory area, * false otherwise. */ -static bool is_boot_memory_area_contiguous(void) +bool is_fadump_boot_mem_contiguous(void) { return is_fadump_mem_area_contiguous(0, fw_dump.boot_memory_size); } @@ -243,7 +243,7 @@ static bool is_boot_memory_area_contiguous(void) * Returns true, if there are no holes in reserved memory area, * false otherwise. */ -static bool is_reserved_memory_area_contiguous(void) +bool is_fadump_reserved_mem_contiguous(void) { u64 d_start, d_end; @@ -617,9 +617,9 @@ static int register_fw_dump(struct fadump_mem_struct *fdm) " dump. Hardware Error(%d).\n", rc); break; case -3: - if (!is_boot_memory_area_contiguous()) + if (!is_fadump_boot_mem_contiguous()) pr_err("Can't have holes in boot memory area while registering fadump\n"); - else if (!is_reserved_memory_area_contiguous()) + else if (!is_fadump_reserved_mem_contiguous()) pr_err("Can't have holes in reserved memory area while" " registering fadump\n"); @@ -749,7 +749,7 @@ fadump_read_registers(struct fadump_reg_entry *reg_entry, struct pt_regs *regs) return reg_entry; } -static u32 *fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs) +u32 *fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs) { struct elf_prstatus prstatus; @@ -764,7 +764,7 @@ static u32 *fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs) return buf; } -static void fadump_update_elfcore_header(char *bufp) +void fadump_update_elfcore_header(char *bufp) { struct elfhdr *elf; struct elf_phdr *phdr; @@ -815,7 +815,7 @@ static void fadump_free_buffer(unsigned long vaddr, unsigned long size) __free_pages(page, order); } -static s32 fadump_setup_cpu_notes_buf(u32 num_cpus) +s32 fadump_setup_cpu_notes_buf(u32 num_cpus) { /* Allocate buffer to hold cpu crash notes. */ fw_dump.cpu_notes_buf_size = num_cpus * sizeof(note_buf_t); @@ -834,7 +834,7 @@ static s32 fadump_setup_cpu_notes_buf(u32 num_cpus) return 0; } -static void fadump_free_cpu_notes_buf(void) +void fadump_free_cpu_notes_buf(void) { if (!fw_dump.cpu_notes_buf_vaddr) return;