--- v9
+++ v5
@@ -1,383 +1,279 @@
-This uses all the infrastructure built up by the previous patches
-in the series to load an ELF vmlinux file and an initrd. It uses the
-flattened device tree at initial_boot_params as a base and adjusts memory
-reservations and its /chosen node for the next kernel.
+arch_kexec_walk_mem and arch_kexec_apply_relocations_add are used by
+generic kexec code, while setup_purgatory is powerpc-specific and sets
+runtime variables needed by the powerpc purgatory implementation.
-[akpm@linux-foundation.org: coding-style fixes]
+Signed-off-by: Josh Sklar <sklar@linux.vnet.ibm.com>
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
- arch/powerpc/include/asm/kexec.h | 12 +
- arch/powerpc/kernel/Makefile | 3 +-
- arch/powerpc/kernel/kexec_elf_64.c | 280 +++++++++++++++++++++++
- arch/powerpc/kernel/machine_kexec_file_64.c | 338 +++++++++++++++++++++++++++-
- 4 files changed, 630 insertions(+), 3 deletions(-)
+ arch/powerpc/Kconfig | 13 ++
+ arch/powerpc/include/asm/kexec.h | 7 +
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/powerpc/kernel/Makefile | 4 +-
+ arch/powerpc/kernel/machine_kexec_64.c | 252 +++++++++++++++++++++++++++++++++
+ 7 files changed, 278 insertions(+), 2 deletions(-)
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index ec4047e170a0..ff362ca60d1b 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -459,6 +459,19 @@ config KEXEC
+ interface is strongly in flux, so no good recommendation can be
+ made.
+
++config KEXEC_FILE
++ bool "kexec file based system call"
++ select KEXEC_CORE
++ select BUILD_BIN2C
++ depends on PPC64
++ depends on CRYPTO=y
++ depends on CRYPTO_SHA256=y
++ help
++ This is a new version of the kexec system call. This call is
++ file based and takes in file descriptors as system call arguments
++ for kernel and initramfs as opposed to a list of segments as is the
++ case for the older kexec call.
++
+ config RELOCATABLE
+ bool "Build a relocatable kernel"
+ depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
-index eca2f975bf44..4497db7555b0 100644
+index a46f5f45570c..83b81b7bdca1 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
-@@ -91,6 +91,18 @@ static inline bool kdump_in_progress(void)
+@@ -91,6 +91,13 @@ static inline bool kdump_in_progress(void)
return crashing_cpu >= 0;
}
+#ifdef CONFIG_KEXEC_FILE
-+extern struct kexec_file_ops kexec_elf64_ops;
-+
+int setup_purgatory(struct kimage *image, const void *slave_code,
+ const void *fdt, unsigned long kernel_load_addr,
+ unsigned long fdt_load_addr, unsigned long stack_top,
+ int debug);
-+int setup_new_fdt(void *fdt, unsigned long initrd_load_addr,
-+ unsigned long initrd_len, const char *cmdline);
-+bool find_debug_console(const void *fdt);
+#endif /* CONFIG_KEXEC_FILE */
+
- #else /* !CONFIG_KEXEC_CORE */
+ #else /* !CONFIG_KEXEC */
static inline void crash_kexec_secondary(struct pt_regs *regs) { }
+diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
+index 2fc5d4db503c..4b369d83fe9c 100644
+--- a/arch/powerpc/include/asm/systbl.h
++++ b/arch/powerpc/include/asm/systbl.h
+@@ -386,3 +386,4 @@ SYSCALL(mlock2)
+ SYSCALL(copy_file_range)
+ COMPAT_SYS_SPU(preadv2)
+ COMPAT_SYS_SPU(pwritev2)
++SYSCALL(kexec_file_load)
+diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
+index cf12c580f6b2..a01e97d3f305 100644
+--- a/arch/powerpc/include/asm/unistd.h
++++ b/arch/powerpc/include/asm/unistd.h
+@@ -12,7 +12,7 @@
+ #include <uapi/asm/unistd.h>
+
+
+-#define NR_syscalls 382
++#define NR_syscalls 383
+
+ #define __NR__exit __NR_exit
+
+diff --git a/arch/powerpc/include/uapi/asm/unistd.h b/arch/powerpc/include/uapi/asm/unistd.h
+index e9f5f41aa55a..2f26335a3c42 100644
+--- a/arch/powerpc/include/uapi/asm/unistd.h
++++ b/arch/powerpc/include/uapi/asm/unistd.h
+@@ -392,5 +392,6 @@
+ #define __NR_copy_file_range 379
+ #define __NR_preadv2 380
+ #define __NR_pwritev2 381
++#define __NR_kexec_file_load 382
+
+ #endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
-index de14b7eb11bb..424b13b1b2b0 100644
+index 6159ec6ac032..ce18a985bcfc 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
-@@ -109,7 +109,8 @@ obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \
- obj-$(CONFIG_PCI_MSI) += msi.o
- obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \
- machine_kexec_$(BITS).o
--obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o elf_util.o
-+obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o elf_util.o \
-+ kexec_elf_$(BITS).o
- obj-$(CONFIG_AUDIT) += audit.o
- obj64-$(CONFIG_AUDIT) += compat_audit.o
-
-diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec_elf_64.c
-new file mode 100644
-index 000000000000..dc29e0131b76
---- /dev/null
-+++ b/arch/powerpc/kernel/kexec_elf_64.c
-@@ -0,0 +1,280 @@
-+/*
-+ * Load ELF vmlinux file for the kexec_file_load syscall.
+@@ -123,9 +123,11 @@ ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)
+ obj-y += iomap.o
+ endif
+
+-ifeq ($(CONFIG_MODULES)$(CONFIG_WORD_SIZE),y64)
++ifneq ($(CONFIG_MODULES)$(CONFIG_KEXEC_FILE),)
++ifeq ($(CONFIG_WORD_SIZE),64)
+ obj-y += elf_util.o elf_util_64.o
+ endif
++endif
+
+ obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o
+
+diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
+index 4c780a342282..1e678dc5096a 100644
+--- a/arch/powerpc/kernel/machine_kexec_64.c
++++ b/arch/powerpc/kernel/machine_kexec_64.c
+@@ -18,6 +18,8 @@
+ #include <linux/kernel.h>
+ #include <linux/cpu.h>
+ #include <linux/hardirq.h>
++#include <linux/memblock.h>
++#include <linux/libfdt.h>
+
+ #include <asm/page.h>
+ #include <asm/current.h>
+@@ -31,6 +33,12 @@
+ #include <asm/hw_breakpoint.h>
+ #include <asm/asm-prototypes.h>
+
++#define SLAVE_CODE_SIZE 256
++
++#ifdef CONFIG_KEXEC_FILE
++static struct kexec_file_ops *kexec_file_loaders[] = { };
++#endif
++
+ #ifdef CONFIG_PPC_BOOK3E
+ int default_machine_kexec_prepare(struct kimage *image)
+ {
+@@ -432,3 +440,247 @@ static int __init export_htab_values(void)
+ }
+ late_initcall(export_htab_values);
+ #endif /* CONFIG_PPC_STD_MMU_64 */
++
++#ifdef CONFIG_KEXEC_FILE
++int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
++ unsigned long buf_len)
++{
++ int i, ret = -ENOEXEC;
++ struct kexec_file_ops *fops;
++
++ /* We don't support crash kernels yet. */
++ if (image->type == KEXEC_TYPE_CRASH)
++ return -ENOTSUPP;
++
++ for (i = 0; i < ARRAY_SIZE(kexec_file_loaders); i++) {
++ fops = kexec_file_loaders[i];
++ if (!fops || !fops->probe)
++ continue;
++
++ ret = fops->probe(buf, buf_len);
++ if (!ret) {
++ image->fops = fops;
++ return ret;
++ }
++ }
++
++ return ret;
++}
++
++void *arch_kexec_kernel_image_load(struct kimage *image)
++{
++ if (!image->fops || !image->fops->load)
++ return ERR_PTR(-ENOEXEC);
++
++ return image->fops->load(image, image->kernel_buf,
++ image->kernel_buf_len, image->initrd_buf,
++ image->initrd_buf_len, image->cmdline_buf,
++ image->cmdline_buf_len);
++}
++
++int arch_kimage_file_post_load_cleanup(struct kimage *image)
++{
++ if (!image->fops || !image->fops->cleanup)
++ return 0;
++
++ return image->fops->cleanup(image->image_loader_data);
++}
++
++/**
++ * arch_kexec_walk_mem() - call func(data) for each unreserved memory block
++ * @kbuf: Context info for the search. Also passed to @func.
++ * @func: Function to call for each memory block.
+ *
-+ * Copyright (C) 2004 Adam Litke (agl@us.ibm.com)
-+ * Copyright (C) 2004 IBM Corp.
-+ * Copyright (C) 2005 R Sharada (sharada@in.ibm.com)
-+ * Copyright (C) 2006 Mohan Kumar M (mohan@in.ibm.com)
-+ * Copyright (C) 2016 IBM Corporation
++ * This function is used by kexec_add_buffer and kexec_locate_mem_hole
++ * to find unreserved memory to load kexec segments into.
+ *
-+ * Based on kexec-tools' kexec-elf-exec.c and kexec-elf-ppc64.c.
-+ * Heavily modified for the kernel by
-+ * Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>.
++ * Return: The memory walk will stop when func returns a non-zero value
++ * and that value will be returned. If all free regions are visited without
++ * func returning non-zero, then zero will be returned.
++ */
++int arch_kexec_walk_mem(struct kexec_buf *kbuf, int (*func)(u64, u64, void *))
++{
++ int ret = 0;
++ u64 i;
++ phys_addr_t mstart, mend;
++
++ if (kbuf->top_down) {
++ for_each_free_mem_range_reverse(i, NUMA_NO_NODE, 0,
++ &mstart, &mend, NULL) {
++ /*
++ * In memblock, end points to the first byte after the
++ * range while in kexec, end points to the last byte
++ * in the range.
++ */
++ ret = func(mstart, mend - 1, kbuf);
++ if (ret)
++ break;
++ }
++ } else {
++ for_each_free_mem_range(i, NUMA_NO_NODE, 0, &mstart, &mend,
++ NULL) {
++ /*
++ * In memblock, end points to the first byte after the
++ * range while in kexec, end points to the last byte
++ * in the range.
++ */
++ ret = func(mstart, mend - 1, kbuf);
++ if (ret)
++ break;
++ }
++ }
++
++ return ret;
++}
++
++/**
++ * arch_kexec_apply_relocations_add() - apply purgatory relocations
++ * @ehdr: Pointer to ELF headers.
++ * @sechdrs: Pointer to section headers.
++ * @relsec: Section index of SHT_RELA section.
+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation (version 2 of the License).
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
++ * Elf64_Shdr.sh_offset has been modified to keep the pointer to the section
++ * contents, while Elf64_Shdr.sh_addr points to the final address of the
++ * section in memory.
+ */
-+
-+#define pr_fmt(fmt) "kexec_elf: " fmt
-+
-+#include <linux/types.h>
-+#include <linux/slab.h>
-+#include <linux/elf.h>
-+#include <linux/kexec.h>
-+#include <linux/of_fdt.h>
-+#include <linux/libfdt.h>
-+#include <asm/elf_util.h>
-+
-+#define PURGATORY_STACK_SIZE (16 * 1024)
++int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,
++ Elf64_Shdr *sechdrs, unsigned int relsec)
++{
++ /* Section containing the relocation entries. */
++ Elf64_Shdr *rel_section = &sechdrs[relsec];
++ const Elf64_Rela *rela = (const Elf64_Rela *) rel_section->sh_offset;
++ unsigned int num_rela = rel_section->sh_size / sizeof(Elf64_Rela);
++ /* Section to which relocations apply. */
++ Elf64_Shdr *target_section = &sechdrs[rel_section->sh_info];
++ /* Associated symbol table. */
++ Elf64_Shdr *symtabsec = &sechdrs[rel_section->sh_link];
++ void *syms_base = (void *) symtabsec->sh_offset;
++ void *loc_base = (void *) target_section->sh_offset;
++ Elf64_Addr addr_base = target_section->sh_addr;
++ struct elf_info elf_info;
++ const char *strtab;
++
++ if (symtabsec->sh_link >= ehdr->e_shnum) {
++ /* Invalid strtab section number */
++ pr_err("Invalid string table section index %d\n",
++ symtabsec->sh_link);
++ return -ENOEXEC;
++ }
++ /* String table for the associated symbol table. */
++ strtab = (const char *) sechdrs[symtabsec->sh_link].sh_offset;
++
++ elf_init_elf_info(ehdr, sechdrs, &elf_info);
++
++ return elf64_apply_relocate_add(&elf_info, strtab, rela, num_rela,
++ syms_base, loc_base, addr_base,
++ true, true, "kexec purgatory");
++}
+
+/**
-+ * build_elf_exec_info - read ELF executable and check that we can use it
-+ */
-+static int build_elf_exec_info(const char *buf, size_t len, struct elfhdr *ehdr,
-+ struct elf_info *elf_info)
-+{
-+ int i;
-+ int ret;
-+
-+ ret = elf_read_from_buffer(buf, len, ehdr, elf_info);
-+ if (ret)
-+ return ret;
-+
-+ /* Big endian vmlinux has type ET_DYN. */
-+ if (ehdr->e_type != ET_EXEC && ehdr->e_type != ET_DYN) {
-+ pr_err("Not an ELF executable.\n");
-+ goto error;
-+ } else if (!elf_info->proghdrs) {
-+ pr_err("No ELF program header.\n");
-+ goto error;
-+ }
-+
-+ for (i = 0; i < ehdr->e_phnum; i++) {
-+ /*
-+ * Kexec does not support loading interpreters.
-+ * In addition this check keeps us from attempting
-+ * to kexec ordinay executables.
-+ */
-+ if (elf_info->proghdrs[i].p_type == PT_INTERP) {
-+ pr_err("Requires an ELF interpreter.\n");
-+ goto error;
-+ }
-+ }
-+
-+ return 0;
-+error:
-+ elf_free_info(elf_info);
-+ return -ENOEXEC;
-+}
-+
-+static int elf64_probe(const char *buf, unsigned long len)
-+{
-+ struct elfhdr ehdr;
-+ struct elf_info elf_info;
-+ int ret;
-+
-+ ret = build_elf_exec_info(buf, len, &ehdr, &elf_info);
-+ if (ret)
-+ return ret;
-+
-+ elf_free_info(&elf_info);
-+
-+ return elf_check_arch(&ehdr) ? 0 : -ENOEXEC;
-+}
-+
-+/**
-+ * elf_exec_load - load ELF executable image
-+ * @lowest_load_addr: On return, will be the address where the first PT_LOAD
-+ * section will be loaded in memory.
-+ *
-+ * Return:
-+ * 0 on success, negative value on failure.
-+ */
-+static int elf_exec_load(struct kimage *image, struct elfhdr *ehdr,
-+ struct elf_info *elf_info,
-+ unsigned long *lowest_load_addr)
-+{
-+ unsigned long base = 0, lowest_addr = UINT_MAX;
-+ int ret;
-+ size_t i;
-+ struct kexec_buf kbuf = { .image = image, .buf_max = ppc64_rma_size,
-+ .top_down = false };
-+
-+ /* Read in the PT_LOAD segments. */
-+ for (i = 0; i < ehdr->e_phnum; i++) {
-+ unsigned long load_addr;
-+ size_t size;
-+ const struct elf_phdr *phdr;
-+
-+ phdr = &elf_info->proghdrs[i];
-+ if (phdr->p_type != PT_LOAD)
-+ continue;
-+
-+ size = phdr->p_filesz;
-+ if (size > phdr->p_memsz)
-+ size = phdr->p_memsz;
-+
-+ kbuf.buffer = (void *) elf_info->buffer + phdr->p_offset;
-+ kbuf.bufsz = size;
-+ kbuf.memsz = phdr->p_memsz;
-+ kbuf.buf_align = phdr->p_align;
-+ kbuf.buf_min = phdr->p_paddr + base;
-+ ret = kexec_add_buffer(&kbuf);
-+ if (ret)
-+ goto out;
-+ load_addr = kbuf.mem;
-+
-+ if (load_addr < lowest_addr)
-+ lowest_addr = load_addr;
-+ }
-+
-+ /* Update entry point to reflect new load address. */
-+ ehdr->e_entry += base;
-+
-+ *lowest_load_addr = lowest_addr;
-+ ret = 0;
-+ out:
-+ return ret;
-+}
-+
-+static void *elf64_load(struct kimage *image, char *kernel_buf,
-+ unsigned long kernel_len, char *initrd,
-+ unsigned long initrd_len, char *cmdline,
-+ unsigned long cmdline_len)
-+{
-+ int i, ret;
-+ unsigned int fdt_size;
-+ unsigned long kernel_load_addr, purgatory_load_addr;
-+ unsigned long initrd_load_addr = 0, fdt_load_addr, stack_top;
-+ void *fdt;
-+ const void *slave_code;
-+ struct elfhdr ehdr;
-+ struct elf_info elf_info;
-+ struct fdt_reserve_entry *rsvmap;
-+ struct kexec_buf kbuf = { .image = image, .buf_min = 0,
-+ .buf_max = ppc64_rma_size };
-+
-+ ret = build_elf_exec_info(kernel_buf, kernel_len, &ehdr, &elf_info);
-+ if (ret)
-+ goto out;
-+
-+ ret = elf_exec_load(image, &ehdr, &elf_info, &kernel_load_addr);
-+ if (ret)
-+ goto out;
-+
-+ pr_debug("Loaded the kernel at 0x%lx\n", kernel_load_addr);
-+
-+ ret = kexec_load_purgatory(image, 0, ppc64_rma_size, true,
-+ &purgatory_load_addr);
-+ if (ret) {
-+ pr_err("Loading purgatory failed.\n");
-+ goto out;
-+ }
-+
-+ pr_debug("Loaded purgatory at 0x%lx\n", purgatory_load_addr);
-+
-+ if (initrd != NULL) {
-+ kbuf.buffer = initrd;
-+ kbuf.bufsz = kbuf.memsz = initrd_len;
-+ kbuf.buf_align = PAGE_SIZE;
-+ kbuf.top_down = false;
-+ ret = kexec_add_buffer(&kbuf);
-+ if (ret)
-+ goto out;
-+ initrd_load_addr = kbuf.mem;
-+
-+ pr_debug("Loaded initrd at 0x%lx\n", initrd_load_addr);
-+ }
-+
-+ fdt_size = fdt_totalsize(initial_boot_params) * 2;
-+ fdt = kmalloc(fdt_size, GFP_KERNEL);
-+ if (!fdt) {
-+ pr_err("Not enough memory for the device tree.\n");
-+ ret = -ENOMEM;
-+ goto out;
-+ }
-+ ret = fdt_open_into(initial_boot_params, fdt, fdt_size);
-+ if (ret < 0) {
-+ pr_err("Error setting up the new device tree.\n");
-+ ret = -EINVAL;
-+ goto out;
-+ }
-+
-+ ret = setup_new_fdt(fdt, initrd_load_addr, initrd_len, cmdline);
-+ if (ret)
-+ goto out;
-+
-+ /*
-+ * Documentation/devicetree/booting-without-of.txt says we need to
-+ * add a reservation entry for the device tree block, but
-+ * early_init_fdt_reserve_self reserves the memory even if there's no
-+ * such entry. We'll add a reservation entry anyway, to be safe and
-+ * compliant.
-+ *
-+ * Use dummy values, we will correct them in a moment.
-+ */
-+ ret = fdt_add_mem_rsv(fdt, 1, 1);
-+ if (ret) {
-+ pr_err("Error reserving device tree memory: %s\n",
-+ fdt_strerror(ret));
-+ ret = -EINVAL;
-+ goto out;
-+ }
-+ fdt_pack(fdt);
-+
-+ kbuf.buffer = fdt;
-+ kbuf.bufsz = kbuf.memsz = fdt_size;
-+ kbuf.buf_align = PAGE_SIZE;
-+ kbuf.top_down = true;
-+ ret = kexec_add_buffer(&kbuf);
-+ if (ret)
-+ goto out;
-+ fdt_load_addr = kbuf.mem;
-+
-+ /*
-+ * Fix fdt reservation, now that we now where it will be loaded
-+ * and how big it is.
-+ */
-+ rsvmap = fdt + fdt_off_mem_rsvmap(fdt);
-+ i = fdt_num_mem_rsv(fdt) - 1;
-+ rsvmap[i].address = cpu_to_fdt64(fdt_load_addr);
-+ rsvmap[i].size = cpu_to_fdt64(fdt_totalsize(fdt));
-+
-+ pr_debug("Loaded device tree at 0x%lx\n", fdt_load_addr);
-+
-+ kbuf.memsz = PURGATORY_STACK_SIZE;
-+ kbuf.buf_align = PAGE_SIZE;
-+ kbuf.top_down = true;
-+ ret = kexec_locate_mem_hole(&kbuf);
-+ if (ret) {
-+ pr_err("Couldn't find free memory for the purgatory stack.\n");
-+ ret = -ENOMEM;
-+ goto out;
-+ }
-+ stack_top = kbuf.mem + PURGATORY_STACK_SIZE - 1;
-+ pr_debug("Purgatory stack is at 0x%lx\n", stack_top);
-+
-+ slave_code = elf_info.buffer + elf_info.proghdrs[0].p_offset;
-+ ret = setup_purgatory(image, slave_code, fdt, kernel_load_addr,
-+ fdt_load_addr, stack_top,
-+ find_debug_console(fdt));
-+ if (ret)
-+ pr_err("Error setting up the purgatory.\n");
-+
-+out:
-+ elf_free_info(&elf_info);
-+
-+ /* Make kimage_file_post_load_cleanup free the fdt buffer for us. */
-+ return ret ? ERR_PTR(ret) : fdt;
-+}
-+
-+struct kexec_file_ops kexec_elf64_ops = {
-+ .probe = elf64_probe,
-+ .load = elf64_load,
-+};
-diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/machine_kexec_file_64.c
-index c6b8f75c1624..9acc56d199f0 100644
---- a/arch/powerpc/kernel/machine_kexec_file_64.c
-+++ b/arch/powerpc/kernel/machine_kexec_file_64.c
-@@ -3,11 +3,12 @@
- *
- * Copyright (C) 2004 Adam Litke (agl@us.ibm.com)
- * Copyright (C) 2004 IBM Corp.
-+ * Copyright (C) 2004,2005 Milton D Miller II, IBM Corporation
- * Copyright (C) 2005 R Sharada (sharada@in.ibm.com)
- * Copyright (C) 2006 Mohan Kumar M (mohan@in.ibm.com)
- * Copyright (C) 2016 IBM Corporation
- *
-- * Based on kexec-tools' kexec-elf-ppc64.c.
-+ * Based on kexec-tools' kexec-elf-ppc64.c, fs2dt.c.
- * Heavily modified for the kernel by
- * Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>.
- *
-@@ -24,12 +25,15 @@
- #include <linux/slab.h>
- #include <linux/kexec.h>
- #include <linux/memblock.h>
-+#include <linux/of_fdt.h>
- #include <linux/libfdt.h>
- #include <asm/elf_util.h>
-
- #define SLAVE_CODE_SIZE 256
-
--static struct kexec_file_ops *kexec_file_loaders[] = { };
-+static struct kexec_file_ops *kexec_file_loaders[] = {
-+ &kexec_elf64_ops,
-+};
-
- int arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
- unsigned long buf_len)
-@@ -243,3 +247,333 @@ int arch_kexec_apply_relocations_add(const Elf64_Ehdr *ehdr,
-
- return 0;
- }
-+
-+/**
-+ * setup_purgatory - initialize the purgatory's global variables
++ * setup_purgatory() - setup the purgatory runtime variables
+ * @image: kexec image.
+ * @slave_code: Slave code for the purgatory.
+ * @fdt: Flattened device tree for the next kernel.
@@ -398,7 +294,7 @@
+ unsigned long opal_base, opal_entry;
+ uint64_t toc;
+ unsigned int *slave_code_buf, master_entry;
-+ unsigned int toc_section;
++ struct elf_info purg_info;
+
+ slave_code_buf = kmalloc(SLAVE_CODE_SIZE, GFP_KERNEL);
+ if (!slave_code_buf)
@@ -463,12 +359,9 @@
+ if (ret)
+ return ret;
+
-+ toc_section = elf_toc_section(image->purgatory_info.ehdr,
-+ image->purgatory_info.sechdrs);
-+ if (!toc_section)
-+ return -ENOEXEC;
-+
-+ toc = elf_my_r2(image->purgatory_info.sechdrs, toc_section);
++ elf_init_elf_info(image->purgatory_info.ehdr,
++ image->purgatory_info.sechdrs, &purg_info);
++ toc = my_r2(&purg_info);
+ ret = kexec_purgatory_get_set_symbol(image, "my_toc", &toc, sizeof(toc),
+ false);
+ if (ret)
@@ -486,224 +379,6 @@
+ return 0;
+}
+
-+/**
-+ * delete_fdt_mem_rsv - delete memory reservation with given address and size
-+ *
-+ * Return: 0 on success, or negative errno on error.
-+ */
-+static int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size)
-+{
-+ int i, ret, num_rsvs = fdt_num_mem_rsv(fdt);
-+
-+ for (i = 0; i < num_rsvs; i++) {
-+ uint64_t rsv_start, rsv_size;
-+
-+ ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size);
-+ if (ret) {
-+ pr_err("Malformed device tree.\n");
-+ return -EINVAL;
-+ }
-+
-+ if (rsv_start == start && rsv_size == size) {
-+ ret = fdt_del_mem_rsv(fdt, i);
-+ if (ret) {
-+ pr_err("Error deleting device tree reservation.\n");
-+ return -EINVAL;
-+ }
-+
-+ return 0;
-+ }
-+ }
-+
-+ return -ENOENT;
-+}
-+
-+/*
-+ * setup_new_fdt - modify /chosen and memory reservation for the next kernel
-+ * @fdt: Flattened device tree for the next kernel.
-+ * @initrd_load_addr: Address where the next initrd will be loaded.
-+ * @initrd_len: Size of the next initrd, or 0 if there will be none.
-+ * @cmdline: Command line for the next kernel, or NULL if there will
-+ * be none.
-+ *
-+ * Return: 0 on success, or negative errno on error.
-+ */
-+int setup_new_fdt(void *fdt, unsigned long initrd_load_addr,
-+ unsigned long initrd_len, const char *cmdline)
-+{
-+ int ret, chosen_node;
-+ const void *prop;
-+
-+ /* Remove memory reservation for the current device tree. */
-+ ret = delete_fdt_mem_rsv(fdt, __pa(initial_boot_params),
-+ fdt_totalsize(initial_boot_params));
-+ if (ret == 0)
-+ pr_debug("Removed old device tree reservation.\n");
-+ else if (ret != -ENOENT)
-+ return ret;
-+
-+ chosen_node = fdt_path_offset(fdt, "/chosen");
-+ if (chosen_node == -FDT_ERR_NOTFOUND) {
-+ chosen_node = fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"),
-+ "chosen");
-+ if (chosen_node < 0) {
-+ pr_err("Error creating /chosen.\n");
-+ return -EINVAL;
-+ }
-+ } else if (chosen_node < 0) {
-+ pr_err("Malformed device tree: error reading /chosen.\n");
-+ return -EINVAL;
-+ }
-+
-+ /* Did we boot using an initrd? */
-+ prop = fdt_getprop(fdt, chosen_node, "linux,initrd-start", NULL);
-+ if (prop) {
-+ uint64_t tmp_start, tmp_end, tmp_size;
-+
-+ tmp_start = fdt64_to_cpu(*((const fdt64_t *) prop));
-+
-+ prop = fdt_getprop(fdt, chosen_node, "linux,initrd-end", NULL);
-+ if (!prop) {
-+ pr_err("Malformed device tree.\n");
-+ return -EINVAL;
-+ }
-+ tmp_end = fdt64_to_cpu(*((const fdt64_t *) prop));
-+
-+ /*
-+ * kexec reserves exact initrd size, while firmware may
-+ * reserve a multiple of PAGE_SIZE, so check for both.
-+ */
-+ tmp_size = tmp_end - tmp_start;
-+ ret = delete_fdt_mem_rsv(fdt, tmp_start, tmp_size);
-+ if (ret == -ENOENT)
-+ ret = delete_fdt_mem_rsv(fdt, tmp_start,
-+ round_up(tmp_size, PAGE_SIZE));
-+ if (ret == 0)
-+ pr_debug("Removed old initrd reservation.\n");
-+ else if (ret != -ENOENT)
-+ return ret;
-+
-+ /* If there's no new initrd, delete the old initrd's info. */
-+ if (initrd_len == 0) {
-+ ret = fdt_delprop(fdt, chosen_node,
-+ "linux,initrd-start");
-+ if (ret) {
-+ pr_err("Error deleting linux,initrd-start.\n");
-+ return -EINVAL;
-+ }
-+
-+ ret = fdt_delprop(fdt, chosen_node, "linux,initrd-end");
-+ if (ret) {
-+ pr_err("Error deleting linux,initrd-end.\n");
-+ return -EINVAL;
-+ }
-+ }
-+ }
-+
-+ if (initrd_len) {
-+ ret = fdt_setprop_u64(fdt, chosen_node,
-+ "linux,initrd-start",
-+ initrd_load_addr);
-+ if (ret < 0) {
-+ pr_err("Error setting up the new device tree.\n");
-+ return -EINVAL;
-+ }
-+
-+ /* initrd-end is the first address after the initrd image. */
-+ ret = fdt_setprop_u64(fdt, chosen_node, "linux,initrd-end",
-+ initrd_load_addr + initrd_len);
-+ if (ret < 0) {
-+ pr_err("Error setting up the new device tree.\n");
-+ return -EINVAL;
-+ }
-+
-+ ret = fdt_add_mem_rsv(fdt, initrd_load_addr, initrd_len);
-+ if (ret) {
-+ pr_err("Error reserving initrd memory: %s\n",
-+ fdt_strerror(ret));
-+ return -EINVAL;
-+ }
-+ }
-+
-+ if (cmdline != NULL) {
-+ ret = fdt_setprop_string(fdt, chosen_node, "bootargs", cmdline);
-+ if (ret < 0) {
-+ pr_err("Error setting up the new device tree.\n");
-+ return -EINVAL;
-+ }
-+ } else {
-+ ret = fdt_delprop(fdt, chosen_node, "bootargs");
-+ if (ret && ret != -FDT_ERR_NOTFOUND) {
-+ pr_err("Error deleting bootargs.\n");
-+ return -EINVAL;
-+ }
-+ }
-+
-+ ret = fdt_setprop(fdt, chosen_node, "linux,booted-from-kexec", NULL, 0);
-+ if (ret) {
-+ pr_err("Error setting up the new device tree.\n");
-+ return -EINVAL;
-+ }
-+
-+ return 0;
-+}
-+
-+/**
-+ * find_debug_console - find out whether there is a console for the purgatory
-+ * @fdt: Flattened device tree to search.
-+ */
-+bool find_debug_console(const void *fdt)
-+{
-+ int len;
-+ int console_node, chosen_node;
-+ const void *prop, *colon;
-+
-+ chosen_node = fdt_path_offset(fdt, "/chosen");
-+ if (chosen_node < 0) {
-+ pr_err("Malformed device tree: /chosen not found.\n");
-+ return false;
-+ }
-+
-+ prop = fdt_getprop(fdt, chosen_node, "stdout-path", &len);
-+ if (prop == NULL) {
-+ if (len == -FDT_ERR_NOTFOUND) {
-+ prop = fdt_getprop(fdt, chosen_node,
-+ "linux,stdout-path", &len);
-+ if (prop == NULL) {
-+ pr_debug("Unable to find [linux,]stdout-path.\n");
-+ return false;
-+ }
-+ } else {
-+ pr_debug("Error finding console: %s\n",
-+ fdt_strerror(len));
-+ return false;
-+ }
-+ }
-+
-+ /*
-+ * stdout-path can have a ':' separating the path from device-specific
-+ * information, so we should only consider what's before it.
-+ */
-+ colon = strchr(prop, ':');
-+ if (colon != NULL)
-+ len = colon - prop;
-+ else
-+ len -= 1; /* Ignore the terminating NUL. */
-+
-+ console_node = fdt_path_offset_namelen(fdt, prop, len);
-+ if (console_node < 0) {
-+ pr_debug("Error finding console: %s\n",
-+ fdt_strerror(console_node));
-+ return false;
-+ }
-+
-+ if (fdt_node_check_compatible(fdt, console_node, "hvterm1") == 0)
-+ return true;
-+ else if (fdt_node_check_compatible(fdt, console_node,
-+ "hvterm-protocol") == 0)
-+ return true;
-+
-+ return false;
-+}
++#endif /* CONFIG_KEXEC_FILE */
--
-2.7.4
+1.9.1