diff --git a/kexec-tools-2.0.12-Pass-struct-mem_sym-into-machine_apply_elf_rel.patch b/kexec-tools-2.0.12-Pass-struct-mem_sym-into-machine_apply_elf_rel.patch deleted file mode 100644 index 3d72611..0000000 --- a/kexec-tools-2.0.12-Pass-struct-mem_sym-into-machine_apply_elf_rel.patch +++ /dev/null @@ -1,231 +0,0 @@ -From 4a2ae3a39c64dc43e9d094be9541253234ff4822 Mon Sep 17 00:00:00 2001 -From: Anton Blanchard -Date: Fri, 26 Feb 2016 18:03:11 +1100 -Subject: [PATCH 1/3] Pass struct mem_sym into machine_apply_elf_rel() - -On PowerPC64 ABIv2 we need to look at the symbol to determine -if it has a local entry point. Pass struct mem_sym into -machine_apply_elf_rel() so we can. - -Signed-off-by: Anton Blanchard -Tested-by: Dave Young -Signed-off-by: Simon Horman ---- - kexec/arch/arm/kexec-elf-rel-arm.c | 5 +++-- - kexec/arch/cris/kexec-elf-rel-cris.c | 5 +++-- - kexec/arch/i386/kexec-elf-rel-x86.c | 5 +++-- - kexec/arch/ia64/kexec-elf-rel-ia64.c | 5 +++-- - kexec/arch/m68k/kexec-elf-rel-m68k.c | 4 +++- - kexec/arch/mips/kexec-elf-rel-mips.c | 4 +++- - kexec/arch/ppc/kexec-elf-rel-ppc.c | 5 +++-- - kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 5 +++-- - kexec/arch/s390/kexec-elf-rel-s390.c | 3 ++- - kexec/arch/sh/kexec-elf-rel-sh.c | 5 +++-- - kexec/arch/x86_64/kexec-elf-rel-x86_64.c | 5 +++-- - kexec/kexec-elf-rel.c | 2 +- - kexec/kexec-elf.h | 5 +++-- - 13 files changed, 36 insertions(+), 22 deletions(-) - -diff --git a/kexec/arch/arm/kexec-elf-rel-arm.c b/kexec/arch/arm/kexec-elf-rel-arm.c -index 214f0cc..a939cf4 100644 ---- a/kexec/arch/arm/kexec-elf-rel-arm.c -+++ b/kexec/arch/arm/kexec-elf-rel-arm.c -@@ -18,8 +18,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - switch(r_type) { - case R_ARM_ABS32: -diff --git a/kexec/arch/cris/kexec-elf-rel-cris.c b/kexec/arch/cris/kexec-elf-rel-cris.c -index c4427cc..255cc2c 100644 ---- a/kexec/arch/cris/kexec-elf-rel-cris.c -+++ b/kexec/arch/cris/kexec-elf-rel-cris.c -@@ -29,8 +29,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - switch(r_type) { - -diff --git a/kexec/arch/i386/kexec-elf-rel-x86.c b/kexec/arch/i386/kexec-elf-rel-x86.c -index fdc3d52..55a214e 100644 ---- a/kexec/arch/i386/kexec-elf-rel-x86.c -+++ b/kexec/arch/i386/kexec-elf-rel-x86.c -@@ -18,8 +18,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - switch(r_type) { - case R_386_32: -diff --git a/kexec/arch/ia64/kexec-elf-rel-ia64.c b/kexec/arch/ia64/kexec-elf-rel-ia64.c -index cfb1061..f847626 100644 ---- a/kexec/arch/ia64/kexec-elf-rel-ia64.c -+++ b/kexec/arch/ia64/kexec-elf-rel-ia64.c -@@ -72,8 +72,9 @@ bundle (const uint64_t insn) - return insn & ~0xfUL; - } - --void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - uint64_t gp_value = ehdr->rel_addr + 0x200000; - switch(r_type) { -diff --git a/kexec/arch/m68k/kexec-elf-rel-m68k.c b/kexec/arch/m68k/kexec-elf-rel-m68k.c -index fa12a16..0cc38cc 100644 ---- a/kexec/arch/m68k/kexec-elf-rel-m68k.c -+++ b/kexec/arch/m68k/kexec-elf-rel-m68k.c -@@ -23,7 +23,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), -+ unsigned long r_type, - void *UNUSED(location), - unsigned long UNUSED(address), - unsigned long UNUSED(value)) -diff --git a/kexec/arch/mips/kexec-elf-rel-mips.c b/kexec/arch/mips/kexec-elf-rel-mips.c -index 6f43639..5bc22d5 100644 ---- a/kexec/arch/mips/kexec-elf-rel-mips.c -+++ b/kexec/arch/mips/kexec-elf-rel-mips.c -@@ -29,7 +29,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), -+ unsigned long r_type, - void *UNUSED(location), - unsigned long UNUSED(address), - unsigned long UNUSED(value)) -diff --git a/kexec/arch/ppc/kexec-elf-rel-ppc.c b/kexec/arch/ppc/kexec-elf-rel-ppc.c -index 90a66f4..1acbd86 100644 ---- a/kexec/arch/ppc/kexec-elf-rel-ppc.c -+++ b/kexec/arch/ppc/kexec-elf-rel-ppc.c -@@ -17,8 +17,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - switch(r_type) { - case R_PPC_ADDR32: -diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -index 9b191d0..8604c4f 100644 ---- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -@@ -63,8 +63,9 @@ static void do_relative_toc(unsigned long value, uint16_t *location, - *location = (*location & ~mask) | (value & mask); - } - --void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *ehdr, struct mem_sym *sym, -+ unsigned long r_type, void *location, unsigned long address, -+ unsigned long value) - { - switch(r_type) { - case R_PPC64_ADDR32: -diff --git a/kexec/arch/s390/kexec-elf-rel-s390.c b/kexec/arch/s390/kexec-elf-rel-s390.c -index 80bcd1b..a5e1b73 100644 ---- a/kexec/arch/s390/kexec-elf-rel-s390.c -+++ b/kexec/arch/s390/kexec-elf-rel-s390.c -@@ -23,7 +23,8 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *ehdr, -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), - unsigned long r_type, - void *loc, - unsigned long address, -diff --git a/kexec/arch/sh/kexec-elf-rel-sh.c b/kexec/arch/sh/kexec-elf-rel-sh.c -index 0bfc45e..3993ee8 100644 ---- a/kexec/arch/sh/kexec-elf-rel-sh.c -+++ b/kexec/arch/sh/kexec-elf-rel-sh.c -@@ -28,8 +28,9 @@ int machine_verify_elf_rel(struct mem_ehdr *ehdr) - return 1; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -- void *orig_loc, unsigned long UNUSED(address), unsigned long relocation) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *orig_loc, -+ unsigned long UNUSED(address), unsigned long relocation) - { - uint32_t *location = orig_loc; - uint32_t value; -diff --git a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -index c795037..7fdde73 100644 ---- a/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -+++ b/kexec/arch/x86_64/kexec-elf-rel-x86_64.c -@@ -57,8 +57,9 @@ static const char *reloc_name(unsigned long r_type) - return name; - } - --void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), unsigned long r_type, -- void *location, unsigned long address, unsigned long value) -+void machine_apply_elf_rel(struct mem_ehdr *UNUSED(ehdr), -+ struct mem_sym *UNUSED(sym), unsigned long r_type, void *location, -+ unsigned long address, unsigned long value) - { - dbgprintf("%s\n", reloc_name(r_type)); - switch(r_type) { -diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c -index c625f30..9a6e63d 100644 ---- a/kexec/kexec-elf-rel.c -+++ b/kexec/kexec-elf-rel.c -@@ -408,7 +408,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, - dbgprintf("sym: %s value: %lx addr: %lx\n", - name, value, address); - -- machine_apply_elf_rel(ehdr, rel.r_type, -+ machine_apply_elf_rel(ehdr, &sym, rel.r_type, - (void *)location, address, value); - } - } -diff --git a/kexec/kexec-elf.h b/kexec/kexec-elf.h -index d0e9dc0..1164db4 100644 ---- a/kexec/kexec-elf.h -+++ b/kexec/kexec-elf.h -@@ -129,7 +129,8 @@ unsigned long elf_max_addr(const struct mem_ehdr *ehdr); - - /* Architecture specific helper functions */ - extern int machine_verify_elf_rel(struct mem_ehdr *ehdr); --extern void machine_apply_elf_rel(struct mem_ehdr *ehdr, unsigned long r_type, -- void *location, unsigned long address, unsigned long value); -+extern void machine_apply_elf_rel(struct mem_ehdr *ehdr, struct mem_sym *sym, -+ unsigned long r_type, void *location, unsigned long address, -+ unsigned long value); - #endif /* KEXEC_ELF_H */ - --- -2.5.0 - diff --git a/kexec-tools-2.0.12-Properly-align-powerpc64-.toc.patch b/kexec-tools-2.0.12-Properly-align-powerpc64-.toc.patch deleted file mode 100644 index 5316e53..0000000 --- a/kexec-tools-2.0.12-Properly-align-powerpc64-.toc.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 3debb8cf3272216119cb2e59a4963ce3c18fe8e3 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Fri, 26 Feb 2016 18:06:15 +1100 -Subject: [PATCH 3/3] Properly align powerpc64 .toc - -gcc leaves .toc byte aligned, relying on the linker to align the section. - - * kexec/arch/ppc64/kexec-elf-rel-ppc64.c (machine_verify_elf_rel): - Fudge alignment of .toc section. - -Signed-off-by: Alan Modra -Signed-off-by: Anton Blanchard -Tested-by: Dave Young -Signed-off-by: Simon Horman ---- - kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 30 ++++++++++++++++++------------ - 1 file changed, 18 insertions(+), 12 deletions(-) - -diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -index 43851f6..5f8e3f2 100644 ---- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -@@ -23,18 +23,6 @@ static unsigned int local_entry_offset(struct mem_sym *UNUSED(sym)) - } - #endif - --int machine_verify_elf_rel(struct mem_ehdr *ehdr) --{ -- if (ehdr->ei_class != ELFCLASS64) { -- return 0; -- } -- if (ehdr->e_machine != EM_PPC64) { -- return 0; -- } -- -- return 1; --} -- - static struct mem_shdr *toc_section(const struct mem_ehdr *ehdr) - { - struct mem_shdr *shdr, *shdr_end; -@@ -52,6 +40,24 @@ static struct mem_shdr *toc_section(const struct mem_ehdr *ehdr) - return NULL; - } - -+int machine_verify_elf_rel(struct mem_ehdr *ehdr) -+{ -+ struct mem_shdr *toc; -+ -+ if (ehdr->ei_class != ELFCLASS64) { -+ return 0; -+ } -+ if (ehdr->e_machine != EM_PPC64) { -+ return 0; -+ } -+ -+ /* Ensure .toc is sufficiently aligned. */ -+ toc = toc_section(ehdr); -+ if (toc && toc->sh_addralign < 256) -+ toc->sh_addralign = 256; -+ return 1; -+} -+ - /* r2 is the TOC pointer: it actually points 0x8000 into the TOC (this - gives the value maximum span in an instruction which uses a signed - offset) */ --- -2.5.0 - diff --git a/kexec-tools-2.0.12-ppc64-purgatory-Handle-local-symbols-in-ELF-ABIv2.patch b/kexec-tools-2.0.12-ppc64-purgatory-Handle-local-symbols-in-ELF-ABIv2.patch deleted file mode 100644 index d513030..0000000 --- a/kexec-tools-2.0.12-ppc64-purgatory-Handle-local-symbols-in-ELF-ABIv2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1e423dc297d10eb7ff25c829d2856ef12fc81d77 Mon Sep 17 00:00:00 2001 -From: Anton Blanchard -Date: Fri, 26 Feb 2016 18:04:16 +1100 -Subject: [PATCH 2/3] ppc64: purgatory: Handle local symbols in ELF ABIv2 - -The PowerPC64 ELF ABIv2 has the concept of global and local symbols -and information on this is encoded in sym->st_other. When doing a -R_PPC64_REL24 branch we want to hit the local entry point, so adjust -it as necessary. - -Signed-off-by: Anton Blanchard -Tested-by: Dave Young -Signed-off-by: Simon Horman ---- - kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -index 8604c4f..43851f6 100644 ---- a/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -+++ b/kexec/arch/ppc64/kexec-elf-rel-ppc64.c -@@ -5,6 +5,24 @@ - #include "../../kexec-elf.h" - #include "kexec-ppc64.h" - -+#if defined(_CALL_ELF) && _CALL_ELF == 2 -+#define STO_PPC64_LOCAL_BIT 5 -+#define STO_PPC64_LOCAL_MASK (7 << STO_PPC64_LOCAL_BIT) -+#define PPC64_LOCAL_ENTRY_OFFSET(other) \ -+ (((1 << (((other) & STO_PPC64_LOCAL_MASK) >> STO_PPC64_LOCAL_BIT)) >> 2) << 2) -+ -+static unsigned int local_entry_offset(struct mem_sym *sym) -+{ -+ /* If this symbol has a local entry point, use it. */ -+ return PPC64_LOCAL_ENTRY_OFFSET(sym->st_other); -+} -+#else -+static unsigned int local_entry_offset(struct mem_sym *UNUSED(sym)) -+{ -+ return 0; -+} -+#endif -+ - int machine_verify_elf_rel(struct mem_ehdr *ehdr) - { - if (ehdr->ei_class != ELFCLASS64) { -@@ -114,6 +132,7 @@ void machine_apply_elf_rel(struct mem_ehdr *ehdr, struct mem_sym *sym, - break; - - case R_PPC64_REL24: -+ value += local_entry_offset(sym); - /* Convert value to relative */ - value -= address; - if (value + 0x2000000 > 0x3ffffff || (value & 3) != 0) { --- -2.5.0 - diff --git a/kexec-tools.spec b/kexec-tools.spec index ad1197a..5367240 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -71,9 +71,6 @@ ExcludeArch: aarch64 # # Patches 301 through 400 are meant for ppc64 kexec-tools enablement # -Patch501: kexec-tools-2.0.12-Pass-struct-mem_sym-into-machine_apply_elf_rel.patch -Patch502: kexec-tools-2.0.12-ppc64-purgatory-Handle-local-symbols-in-ELF-ABIv2.patch -Patch503: kexec-tools-2.0.12-Properly-align-powerpc64-.toc.patch # # Patches 401 through 500 are meant for s390 kexec-tools enablement @@ -110,9 +107,6 @@ tar -z -x -v -f %{SOURCE19} tar -z -x -v -f %{SOURCE23} -%patch501 -p1 -%patch502 -p1 -%patch503 -p1 %patch601 -p1 %patch602 -p1