diff options
author | Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> | 2012-02-15 20:14:53 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-22 18:50:02 -0500 |
commit | d34c5f26cf7de52a72ee064698817a5a39b91767 (patch) | |
tree | e4e1d536bc244a27b97a6751da0306e989f478ec /arch/powerpc/kernel | |
parent | ebaeb5ae24379b5b635dc1d1fa6df904bc95b4d9 (diff) |
fadump: Add PT_NOTE program header for vmcoreinfo
Introduce a PT_NOTE program header that points to physical address of
vmcoreinfo_note buffer declared in kernel/kexec.c. The vmcoreinfo
note buffer is populated during crash_fadump() at the time of system
crash.
Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/fadump.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index da68bdad194a..a83bc9015c64 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c | |||
@@ -814,6 +814,19 @@ static void fadump_setup_crash_memory_ranges(void) | |||
814 | } | 814 | } |
815 | } | 815 | } |
816 | 816 | ||
817 | /* | ||
818 | * If the given physical address falls within the boot memory region then | ||
819 | * return the relocated address that points to the dump region reserved | ||
820 | * for saving initial boot memory contents. | ||
821 | */ | ||
822 | static inline unsigned long fadump_relocate(unsigned long paddr) | ||
823 | { | ||
824 | if (paddr > RMA_START && paddr < fw_dump.boot_memory_size) | ||
825 | return fdm.rmr_region.destination_address + paddr; | ||
826 | else | ||
827 | return paddr; | ||
828 | } | ||
829 | |||
817 | static int fadump_create_elfcore_headers(char *bufp) | 830 | static int fadump_create_elfcore_headers(char *bufp) |
818 | { | 831 | { |
819 | struct elfhdr *elf; | 832 | struct elfhdr *elf; |
@@ -845,6 +858,22 @@ static int fadump_create_elfcore_headers(char *bufp) | |||
845 | 858 | ||
846 | (elf->e_phnum)++; | 859 | (elf->e_phnum)++; |
847 | 860 | ||
861 | /* setup ELF PT_NOTE for vmcoreinfo */ | ||
862 | phdr = (struct elf_phdr *)bufp; | ||
863 | bufp += sizeof(struct elf_phdr); | ||
864 | phdr->p_type = PT_NOTE; | ||
865 | phdr->p_flags = 0; | ||
866 | phdr->p_vaddr = 0; | ||
867 | phdr->p_align = 0; | ||
868 | |||
869 | phdr->p_paddr = fadump_relocate(paddr_vmcoreinfo_note()); | ||
870 | phdr->p_offset = phdr->p_paddr; | ||
871 | phdr->p_memsz = vmcoreinfo_max_size; | ||
872 | phdr->p_filesz = vmcoreinfo_max_size; | ||
873 | |||
874 | /* Increment number of program headers. */ | ||
875 | (elf->e_phnum)++; | ||
876 | |||
848 | /* setup PT_LOAD sections. */ | 877 | /* setup PT_LOAD sections. */ |
849 | 878 | ||
850 | for (i = 0; i < crash_mem_ranges; i++) { | 879 | for (i = 0; i < crash_mem_ranges; i++) { |