<div dir="ltr">Does this work on poky-lsb? Previous upgrades were failing with that due to the security flags being enabled.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 8 November 2017 at 09:56, zhengrq <span dir="ltr"><<a href="mailto:zhengrq.fnst@cn.fujitsu.com" target="_blank">zhengrq.fnst@cn.fujitsu.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">1) Upgrade kexec-tools from 2.0.14 to 2.0.15.<br>
2) Remove patches that are included in 2.0.15.<br>
kexec-tools/0001-arm64-<wbr>Disable-PIC.patch<br>
kexec-tools/0001-kexec-<wbr>exntend-the-semantics-of-<wbr>kexec_iomem_for_each_.patch<br>
kexec-tools/0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch<br>
kexec-tools/0001-x86-x86_64-<wbr>Fix-format-warning-with-die.<wbr>patch<br>
kexec-tools/0002-kexec-<wbr>generalize-and-rename-get_<wbr>kernel_stext_sym.patch<br>
kexec-tools/0002-ppc-Fix-<wbr>format-warning-with-die.patch<br>
kexec-tools/0003-arm64-<wbr>identify-PHYS_OFFSET-<wbr>correctly.patch<br>
kexec-tools/0004-arm64-kdump-<wbr>identify-memory-regions.patch<br>
kexec-tools/0005-arm64-kdump-<wbr>add-elf-core-header-segment.<wbr>patch<br>
kexec-tools/0006-arm64-kdump-<wbr>set-up-kernel-image-segment.<wbr>patch<br>
kexec-tools/0007-arm64-kdump-<wbr>set-up-other-segments.patch<br>
kexec-tools/0008-arm64-kdump-<wbr>add-DT-properties-to-crash-<wbr>dump-kernel-s.patch<br>
kexec-tools/0009-arm64-kdump-<wbr>Add-support-for-binary-image-<wbr>files.patch<br>
<br>
Signed-off-by: Zheng Ruoqin <<a href="mailto:zhengrq.fnst@cn.fujitsu.com">zhengrq.fnst@cn.fujitsu.com</a>><br>
---<br>
.../kexec/kexec-tools/0001-<wbr>arm64-Disable-PIC.patch | 31 ----<br>
...nd-the-semantics-of-kexec_<wbr>iomem_for_each_.patch | 78 --------<br>
.../0001-vmcore-dmesg-Define-_<wbr>GNU_SOURCE.patch | 31 ----<br>
...01-x86-x86_64-Fix-format-<wbr>warning-with-die.patch | 78 --------<br>
...eneralize-and-rename-get_<wbr>kernel_stext_sym.patch | 194 --------------------<br>
.../0002-ppc-Fix-format-<wbr>warning-with-die.patch | 43 -----<br>
...0003-arm64-identify-PHYS_<wbr>OFFSET-correctly.patch | 76 --------<br>
.../0004-arm64-kdump-identify-<wbr>memory-regions.patch | 202 ---------------------<br>
...5-arm64-kdump-add-elf-core-<wbr>header-segment.patch | 191 -------------------<br>
...6-arm64-kdump-set-up-<wbr>kernel-image-segment.patch | 137 --------------<br>
.../0007-arm64-kdump-set-up-<wbr>other-segments.patch | 35 ----<br>
...-add-DT-properties-to-<wbr>crash-dump-kernel-s.patch | 150 ---------------<br>
...-kdump-Add-support-for-<wbr>binary-image-files.patch | 52 ------<br>
...<a href="http://kexec-tools_2.0.14.bb" rel="noreferrer" target="_blank">kexec-tools_2.0.14.bb</a> => <a href="http://kexec-tools_2.0.15.bb" rel="noreferrer" target="_blank">kexec-tools_2.0.15.bb</a>} | 17 +-<br>
14 files changed, 2 insertions(+), 1313 deletions(-)<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-arm64-<wbr>Disable-PIC.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-kexec-<wbr>exntend-the-semantics-of-<wbr>kexec_iomem_for_each_.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-x86-x86_64-<wbr>Fix-format-warning-with-die.<wbr>patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-kexec-<wbr>generalize-and-rename-get_<wbr>kernel_stext_sym.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-ppc-Fix-<wbr>format-warning-with-die.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0003-arm64-<wbr>identify-PHYS_OFFSET-<wbr>correctly.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0004-arm64-kdump-<wbr>identify-memory-regions.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0005-arm64-kdump-<wbr>add-elf-core-header-segment.<wbr>patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0006-arm64-kdump-<wbr>set-up-kernel-image-segment.<wbr>patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0007-arm64-kdump-<wbr>set-up-other-segments.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0008-arm64-kdump-<wbr>add-DT-properties-to-crash-<wbr>dump-kernel-s.patch<br>
delete mode 100644 meta/recipes-kernel/kexec/<wbr>kexec-tools/0009-arm64-kdump-<wbr>Add-support-for-binary-image-<wbr>files.patch<br>
rename meta/recipes-kernel/kexec/{<a href="http://kexec-tools_2.0.14.bb" rel="noreferrer" target="_blank">kex<wbr>ec-tools_2.0.14.bb</a> => <a href="http://kexec-tools_2.0.15.bb" rel="noreferrer" target="_blank">kexec-tools_2.0.15.bb</a>} (63%)<br>
<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-arm64-<wbr>Disable-PIC.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-arm64-<wbr>Disable-PIC.patch<br>
deleted file mode 100644<br>
index 84e94d7..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-arm64-<wbr>Disable-PIC.patch<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-From 3bb73e5e5649b455e15d5ca3a7ad1a<wbr>90c4960972 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Sat, 10 Jun 2017 11:54:36 -0700<br>
-Subject: [PATCH] arm64: Disable PIC<br>
-<br>
-Fix<br>
-| cc1: sorry, unimplemented: code model 'large' with -fPIC<br>
-| make: *** [Makefile:118: purgatory/arch/arm64/entry.o] Error 1<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
-Upstream-Status: Pending<br>
-<br>
- purgatory/arch/arm64/Makefile | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/purgatory/arch/arm64/<wbr>Makefile b/purgatory/arch/arm64/<wbr>Makefile<br>
-index 636abea..80068ca 100644<br>
---- a/purgatory/arch/arm64/<wbr>Makefile<br>
-+++ b/purgatory/arch/arm64/<wbr>Makefile<br>
-@@ -1,6 +1,7 @@<br>
-<br>
- arm64_PURGATORY_EXTRA_CFLAGS = \<br>
- -mcmodel=large \<br>
-+ -fno-PIC \<br>
- -fno-stack-protector \<br>
- -fno-asynchronous-unwind-<wbr>tables \<br>
- -Wundef \<br>
---<br>
-2.13.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-kexec-<wbr>exntend-the-semantics-of-<wbr>kexec_iomem_for_each_.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-kexec-<wbr>exntend-the-semantics-of-<wbr>kexec_iomem_for_each_.patch<br>
deleted file mode 100644<br>
index 822f28c..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-kexec-<wbr>exntend-the-semantics-of-<wbr>kexec_iomem_for_each_.patch<br>
+++ /dev/null<br>
@@ -1,78 +0,0 @@<br>
-From 02eed0f8f2748fd7579f69e5373445<wbr>b52b2b8754 Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Mon, 17 Oct 2016 13:56:58 +0900<br>
-Subject: [PATCH 1/9] kexec: exntend the semantics of kexec_iomem_for_each_line<br>
-<br>
-The current kexec_iomem_for_each_line() counts up all the lines for which<br>
-a callback function returns zero(0) or positive, and otherwise it stops<br>
-further scanning.<br>
-This behavior is incovenient in some cases. For instance, on arm64, we want<br>
-to count up "System RAM" entries, but need to skip "reserved" entries.<br>
-<br>
-So this patch extends the semantics so that we will continue to scan<br>
-succeeding entries but not count lines for which a callback function<br>
-returns positive.<br>
-<br>
-The current users of kexec_iomem_for_each_line(), arm, sh and x86, will not<br>
-be affected by this change because<br>
-* arm<br>
- The callback function only returns -1 or 0, and the return value of<br>
- kexec_iomem_for_each_line() will never be used.<br>
-* sh, x86<br>
- The callback function may return (-1 for sh,) 0 or 1, but always returns<br>
- 1 once we have reached the maximum number of entries allowed.<br>
- Even so the current kexec_iomem_for_each_line() counts them up.<br>
- This change actually fixes this bug.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/kexec-iomem.c | 15 ++++++++++-----<br>
- 1 file changed, 10 insertions(+), 5 deletions(-)<br>
-<br>
-diff --git a/kexec/kexec-iomem.c b/kexec/kexec-iomem.c<br>
-index 485a2e8..0a0277a 100644<br>
---- a/kexec/kexec-iomem.c<br>
-+++ b/kexec/kexec-iomem.c<br>
-@@ -18,6 +18,9 @@<br>
- * Iterate over each line in the file returned by proc_iomem(). If match is<br>
- * NULL or if the line matches with our match-pattern then call the<br>
- * callback if non-NULL.<br>
-+ * If match is NULL, callback should return a negative if error.<br>
-+ * Otherwise the interation goes on, incrementing nr but only if callback<br>
-+ * returns 0 (matched).<br>
- *<br>
- * Return the number of lines matched.<br>
- */<br>
-@@ -37,7 +40,7 @@ int kexec_iomem_for_each_line(char *match,<br>
- char *str;<br>
- int consumed;<br>
- int count;<br>
-- int nr = 0;<br>
-+ int nr = 0, ret;<br>
-<br>
- fp = fopen(iomem, "r");<br>
- if (!fp)<br>
-@@ -50,11 +53,13 @@ int kexec_iomem_for_each_line(char *match,<br>
- str = line + consumed;<br>
- size = end - start + 1;<br>
- if (!match || memcmp(str, match, strlen(match)) == 0) {<br>
-- if (callback<br>
-- && callback(data, nr, str, start, size) < 0) {<br>
-- break;<br>
-+ if (callback) {<br>
-+ ret = callback(data, nr, str, start, size);<br>
-+ if (ret < 0)<br>
-+ break;<br>
-+ else if (ret == 0)<br>
-+ nr++;<br>
- }<br>
-- nr++;<br>
- }<br>
- }<br>
-<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch<br>
deleted file mode 100644<br>
index 90c2f6e..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch<br>
+++ /dev/null<br>
@@ -1,31 +0,0 @@<br>
-From d811875a41b4628040abaada3da29b<wbr>7b9592e757 Mon Sep 17 00:00:00 2001<br>
-From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
-Date: Sat, 9 Jan 2016 17:16:16 -0800<br>
-Subject: [PATCH] vmcore-dmesg: Define _GNU_SOURCE<br>
-<br>
-loff_t is guarded with _GNU_SOURCE on some C library implementations<br>
-e.g. musl since this type is not defined by POSIX. Define _GNU_SOURCE to<br>
-include this define, it should help compiling on musl while nothing<br>
-changes for glibc based systems since there _GNU_SOURCE is already<br>
-defined<br>
-<br>
-Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
----<br>
-Upstream-Status: Submitted<br>
-<br>
- vmcore-dmesg/vmcore-dmesg.c | 1 +<br>
- 1 file changed, 1 insertion(+)<br>
-<br>
-diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c<br>
-index 0364636..a8f56df 100644<br>
---- a/vmcore-dmesg/vmcore-dmesg.c<br>
-+++ b/vmcore-dmesg/vmcore-dmesg.c<br>
-@@ -1,4 +1,5 @@<br>
- #define _XOPEN_SOURCE 600<br>
-+#define _GNU_SOURCE<br>
- #define _LARGEFILE_SOURCE 1<br>
- #define _FILE_OFFSET_BITS 64<br>
- #include <endian.h><br>
---<br>
-2.7.0<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-x86-x86_64-<wbr>Fix-format-warning-with-die.<wbr>patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-x86-x86_64-<wbr>Fix-format-warning-with-die.<wbr>patch<br>
deleted file mode 100644<br>
index e601f52..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0001-x86-x86_64-<wbr>Fix-format-warning-with-die.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,78 +0,0 @@<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
-<br>
-<br>
-From 1550f81bf1886aa0520da0b6181cd6<wbr>1c1a75d4ad Mon Sep 17 00:00:00 2001<br>
-From: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-Date: Tue, 14 Mar 2017 17:59:22 +0530<br>
-Subject: [PATCH 1/2] x86/x86_64: Fix format warning with die()<br>
-<br>
-Fedora koji uses gcc version 7.0.1-0.12.fc27, and it generates a build<br>
-warning<br>
-<br>
- kexec/arch/i386/kexec-elf-x86.<wbr>c:299:3: error: format not a string<br>
- literal and no format arguments [-Werror=format-security]<br>
- die(error_msg);<br>
- ^~~<br>
- cc1: some warnings being treated as errors<br>
-<br>
-error_msg can have a format specifier as well in string. In such cases,<br>
-if there is no other arguments for the format variable then code will<br>
-try to access a non existing argument. Therefore, use 1st argument as<br>
-format specifier for string print and pass error_msg as the string to be<br>
-printed.<br>
-<br>
-While doing that,also use const qualifier before "char *error_msg".<br>
-<br>
-Signed-off-by: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-Signed-off-by: Simon Horman <<a href="mailto:horms@verge.net.au">horms@verge.net.au</a>><br>
----<br>
- kexec/arch/i386/kexec-elf-x86.<wbr>c | 4 ++--<br>
- kexec/arch/x86_64/kexec-elf-<wbr>x86_64.c | 4 ++--<br>
- 2 files changed, 4 insertions(+), 4 deletions(-)<br>
-<br>
-diff --git a/kexec/arch/i386/kexec-elf-<wbr>x86.c b/kexec/arch/i386/kexec-elf-<wbr>x86.c<br>
-index de00dcb..fedf031 100644<br>
---- a/kexec/arch/i386/kexec-elf-<wbr>x86.c<br>
-+++ b/kexec/arch/i386/kexec-elf-<wbr>x86.c<br>
-@@ -91,7 +91,7 @@ int elf_x86_load(int argc, char **argv, const char *buf, off_t len,<br>
- char *command_line = NULL, *modified_cmdline = NULL;<br>
- const char *append = NULL;<br>
- char *tmp_cmdline = NULL;<br>
-- char *error_msg = NULL;<br>
-+ const char *error_msg = NULL;<br>
- int result;<br>
- int command_line_len;<br>
- const char *ramdisk;<br>
-@@ -296,6 +296,6 @@ out:<br>
- free(command_line);<br>
- free(modified_cmdline);<br>
- if (error_msg)<br>
-- die(error_msg);<br>
-+ die("%s", error_msg);<br>
- return result;<br>
- }<br>
-diff --git a/kexec/arch/x86_64/kexec-elf-<wbr>x86_64.c b/kexec/arch/x86_64/kexec-elf-<wbr>x86_64.c<br>
-index ae65692..ad22311 100644<br>
---- a/kexec/arch/x86_64/kexec-elf-<wbr>x86_64.c<br>
-+++ b/kexec/arch/x86_64/kexec-elf-<wbr>x86_64.c<br>
-@@ -99,7 +99,7 @@ int elf_x86_64_load(int argc, char **argv, const char *buf, off_t len,<br>
- #define ARG_STYLE_NONE 2<br>
- int opt;<br>
- int result = 0;<br>
-- char *error_msg = NULL;<br>
-+ const char *error_msg = NULL;<br>
-<br>
- /* See options.h and add any new options there too! */<br>
- static const struct option options[] = {<br>
-@@ -276,6 +276,6 @@ out:<br>
- free(command_line);<br>
- free(modified_cmdline);<br>
- if (error_msg)<br>
-- die(error_msg);<br>
-+ die("%s", error_msg);<br>
- return result;<br>
- }<br>
---<br>
-2.11.0<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-kexec-<wbr>generalize-and-rename-get_<wbr>kernel_stext_sym.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-kexec-<wbr>generalize-and-rename-get_<wbr>kernel_stext_sym.patch<br>
deleted file mode 100644<br>
index 953f13b..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-kexec-<wbr>generalize-and-rename-get_<wbr>kernel_stext_sym.patch<br>
+++ /dev/null<br>
@@ -1,194 +0,0 @@<br>
-From d29f37bb6e9114aba96c606103b110<wbr>f511bee9a1 Mon Sep 17 00:00:00 2001<br>
-From: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-Date: Wed, 2 Nov 2016 15:05:25 +0530<br>
-Subject: [PATCH 2/9] kexec: generalize and rename get_kernel_stext_sym()<br>
-<br>
-get_kernel_stext_sym() has been defined for both arm and i386. Other<br>
-architecture might need some other kernel symbol address. Therefore rewrite<br>
-this function as generic function to get any kernel symbol address.<br>
-<br>
-More over, kallsyms is not arch specific representation, therefore have<br>
-common function for all arches.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-[created symbols.c]<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/Makefile | 1 +<br>
- kexec/arch/arm/crashdump-arm.c | 40 +-----------------------------<wbr>----------<br>
- kexec/arch/i386/crashdump-x86.<wbr>c | 29 -----------------------------<br>
- kexec/kexec.h | 2 ++<br>
- kexec/symbols.c | 41 ++++++++++++++++++++++++++++++<wbr>+++++++++++<br>
- 5 files changed, 45 insertions(+), 68 deletions(-)<br>
- create mode 100644 kexec/symbols.c<br>
-<br>
-diff --git a/kexec/Makefile b/kexec/Makefile<br>
-index 39f365f..2b4fb3d 100644<br>
---- a/kexec/Makefile<br>
-+++ b/kexec/Makefile<br>
-@@ -26,6 +26,7 @@ KEXEC_SRCS_base += kexec/kernel_version.c<br>
- KEXEC_SRCS_base += kexec/lzma.c<br>
- KEXEC_SRCS_base += kexec/zlib.c<br>
- KEXEC_SRCS_base += kexec/kexec-xen.c<br>
-+KEXEC_SRCS_base += kexec/symbols.c<br>
-<br>
- KEXEC_GENERATED_SRCS += $(PURGATORY_HEX_C)<br>
-<br>
-diff --git a/kexec/arch/arm/crashdump-<wbr>arm.c b/kexec/arch/arm/crashdump-<wbr>arm.c<br>
-index 4a89b5e..245c21a 100644<br>
---- a/kexec/arch/arm/crashdump-<wbr>arm.c<br>
-+++ b/kexec/arch/arm/crashdump-<wbr>arm.c<br>
-@@ -73,48 +73,10 @@ static struct crash_elf_info elf_info = {<br>
-<br>
- extern unsigned long long user_page_offset;<br>
-<br>
--/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */<br>
--static unsigned long long get_kernel_stext_sym(void)<br>
--{<br>
-- const char *kallsyms = "/proc/kallsyms";<br>
-- const char *stext = "_stext";<br>
-- char sym[128];<br>
-- char line[128];<br>
-- FILE *fp;<br>
-- unsigned long long vaddr = 0;<br>
-- char type;<br>
--<br>
-- fp = fopen(kallsyms, "r");<br>
-- if (!fp) {<br>
-- fprintf(stderr, "Cannot open %s\n", kallsyms);<br>
-- return 0;<br>
-- }<br>
--<br>
-- while(fgets(line, sizeof(line), fp) != NULL) {<br>
-- unsigned long long addr;<br>
--<br>
-- if (sscanf(line, "%Lx %c %s", &addr, &type, sym) != 3)<br>
-- continue;<br>
--<br>
-- if (strcmp(sym, stext) == 0) {<br>
-- dbgprintf("kernel symbol %s vaddr = %#llx\n", stext, addr);<br>
-- vaddr = addr;<br>
-- break;<br>
-- }<br>
-- }<br>
--<br>
-- fclose(fp);<br>
--<br>
-- if (vaddr == 0)<br>
-- fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);<br>
--<br>
-- return vaddr;<br>
--}<br>
--<br>
- static int get_kernel_page_offset(struct kexec_info *info,<br>
- struct crash_elf_info *elf_info)<br>
- {<br>
-- unsigned long long stext_sym_addr = get_kernel_stext_sym();<br>
-+ unsigned long long stext_sym_addr = get_kernel_sym("_stext");<br>
- if (stext_sym_addr == 0) {<br>
- if (user_page_offset != (-1ULL)) {<br>
- elf_info->page_offset = user_page_offset;<br>
-diff --git a/kexec/arch/i386/crashdump-<wbr>x86.c b/kexec/arch/i386/crashdump-<wbr>x86.c<br>
-index ab833d4..abf82a5 100644<br>
---- a/kexec/arch/i386/crashdump-<wbr>x86.c<br>
-+++ b/kexec/arch/i386/crashdump-<wbr>x86.c<br>
-@@ -102,35 +102,6 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),<br>
- return -1;<br>
- }<br>
-<br>
--/* Retrieve kernel symbol virtual address from /proc/kallsyms */<br>
--static unsigned long long get_kernel_sym(const char *symbol)<br>
--{<br>
-- const char *kallsyms = "/proc/kallsyms";<br>
-- char sym[128];<br>
-- char line[128];<br>
-- FILE *fp;<br>
-- unsigned long long vaddr;<br>
-- char type;<br>
--<br>
-- fp = fopen(kallsyms, "r");<br>
-- if (!fp) {<br>
-- fprintf(stderr, "Cannot open %s\n", kallsyms);<br>
-- return 0;<br>
-- }<br>
--<br>
-- while(fgets(line, sizeof(line), fp) != NULL) {<br>
-- if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)<br>
-- continue;<br>
-- if (strcmp(sym, symbol) == 0) {<br>
-- dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);<br>
-- return vaddr;<br>
-- }<br>
-- }<br>
--<br>
-- fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);<br>
-- return 0;<br>
--}<br>
--<br>
- /* Retrieve info regarding virtual address kernel has been compiled for and<br>
- * size of the kernel from /proc/kcore. Current /proc/kcore parsing from<br>
- * from kexec-tools fails because of malformed elf notes. A kernel patch has<br>
-diff --git a/kexec/kexec.h b/kexec/kexec.h<br>
-index 9194f1c..b4fafad 100644<br>
---- a/kexec/kexec.h<br>
-+++ b/kexec/kexec.h<br>
-@@ -312,4 +312,6 @@ int xen_kexec_load(struct kexec_info *info);<br>
- int xen_kexec_unload(uint64_t kexec_flags);<br>
- void xen_kexec_exec(void);<br>
-<br>
-+extern unsigned long long get_kernel_sym(const char *text);<br>
-+<br>
- #endif /* KEXEC_H */<br>
-diff --git a/kexec/symbols.c b/kexec/symbols.c<br>
-new file mode 100644<br>
-index 0000000..ea6e327<br>
---- /dev/null<br>
-+++ b/kexec/symbols.c<br>
-@@ -0,0 +1,41 @@<br>
-+#include <stdio.h><br>
-+#include <string.h><br>
-+#include "kexec.h"<br>
-+<br>
-+/* Retrieve kernel symbol virtual address from /proc/kallsyms */<br>
-+unsigned long long get_kernel_sym(const char *text)<br>
-+{<br>
-+ const char *kallsyms = "/proc/kallsyms";<br>
-+ char sym[128];<br>
-+ char line[128];<br>
-+ FILE *fp;<br>
-+ unsigned long long vaddr = 0;<br>
-+ char type;<br>
-+<br>
-+ fp = fopen(kallsyms, "r");<br>
-+ if (!fp) {<br>
-+ fprintf(stderr, "Cannot open %s\n", kallsyms);<br>
-+ return 0;<br>
-+ }<br>
-+<br>
-+ while (fgets(line, sizeof(line), fp) != NULL) {<br>
-+ unsigned long long addr;<br>
-+<br>
-+ if (sscanf(line, "%Lx %c %s", &addr, &type, sym) != 3)<br>
-+ continue;<br>
-+<br>
-+ if (strcmp(sym, text) == 0) {<br>
-+ dbgprintf("kernel symbol %s vaddr = %#llx\n",<br>
-+ text, addr);<br>
-+ vaddr = addr;<br>
-+ break;<br>
-+ }<br>
-+ }<br>
-+<br>
-+ fclose(fp);<br>
-+<br>
-+ if (vaddr == 0)<br>
-+ fprintf(stderr, "Cannot get kernel %s symbol address\n", text);<br>
-+<br>
-+ return vaddr;<br>
-+}<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-ppc-Fix-<wbr>format-warning-with-die.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-ppc-Fix-<wbr>format-warning-with-die.patch<br>
deleted file mode 100644<br>
index 6a1c06d..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0002-ppc-Fix-<wbr>format-warning-with-die.patch<br>
+++ /dev/null<br>
@@ -1,43 +0,0 @@<br>
-From 1c956fc8c6b6324d8d38bba5f9e60a<wbr>018051c6f5 Mon Sep 17 00:00:00 2001<br>
-From: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
-Date: Thu, 16 Mar 2017 15:39:06 +0200<br>
-Subject: [PATCH 2/2] ppc: Fix format warning with die()<br>
-<br>
-Enable compiling kexec-tools for ppc with -Werror=format-security.<br>
-<br>
-Signed-off-by: Jussi Kukkonen <<a href="mailto:jussi.kukkonen@intel.com">jussi.kukkonen@intel.com</a>><br>
-Upstream-Status: Submitted [Mailing list]<br>
----<br>
- kexec/arch/ppc/kexec-elf-ppc.c | 2 +-<br>
- kexec/arch/ppc/kexec-uImage-<wbr>ppc.c | 2 +-<br>
- 2 files changed, 2 insertions(+), 2 deletions(-)<br>
-<br>
-diff --git a/kexec/arch/ppc/kexec-elf-<wbr>ppc.c b/kexec/arch/ppc/kexec-elf-<wbr>ppc.c<br>
-index 291f06d..ad43ad1 100644<br>
---- a/kexec/arch/ppc/kexec-elf-<wbr>ppc.c<br>
-+++ b/kexec/arch/ppc/kexec-elf-<wbr>ppc.c<br>
-@@ -453,7 +453,7 @@ out:<br>
- if (!tmp_cmdline)<br>
- free(command_line);<br>
- if (error_msg)<br>
-- die(error_msg);<br>
-+ die("%s", error_msg);<br>
-<br>
- return result;<br>
- }<br>
-diff --git a/kexec/arch/ppc/kexec-uImage-<wbr>ppc.c b/kexec/arch/ppc/kexec-uImage-<wbr>ppc.c<br>
-index 5eec6e4..e8f7adc 100644<br>
---- a/kexec/arch/ppc/kexec-uImage-<wbr>ppc.c<br>
-+++ b/kexec/arch/ppc/kexec-uImage-<wbr>ppc.c<br>
-@@ -306,7 +306,7 @@ out:<br>
- if (!tmp_cmdline)<br>
- free(command_line);<br>
- if (error_msg)<br>
-- die(error_msg);<br>
-+ die("%s", error_msg);<br>
- return ret;<br>
- }<br>
-<br>
---<br>
-2.11.0<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0003-arm64-<wbr>identify-PHYS_OFFSET-<wbr>correctly.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0003-arm64-<wbr>identify-PHYS_OFFSET-<wbr>correctly.patch<br>
deleted file mode 100644<br>
index 1a1c317..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0003-arm64-<wbr>identify-PHYS_OFFSET-<wbr>correctly.patch<br>
+++ /dev/null<br>
@@ -1,76 +0,0 @@<br>
-From 16df170ad4808d12acd5e919ac4f6e<wbr>7f33a247b3 Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Thu, 1 Sep 2016 10:57:42 +0900<br>
-Subject: [PATCH 3/9] arm64: identify PHYS_OFFSET correctly<br>
-<br>
-Due to the kernel patch, commit e7cd190385d1 ("arm64: mark reserved<br>
-memblock regions explicitly in iomem"), the current code will not be able<br>
-to identify the correct value of PHYS_OFFSET if some "reserved" memory<br>
-region, which is likely to be UEFI runtime services code/data, exists at<br>
-an address below the first "System RAM" regions.<br>
-<br>
-This patch fixes this issue.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/iomem.h | 7 +++++++<br>
- kexec/arch/arm64/kexec-arm64.c | 12 ++++++++++--<br>
- 2 files changed, 17 insertions(+), 2 deletions(-)<br>
- create mode 100644 kexec/arch/arm64/iomem.h<br>
-<br>
-diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h<br>
-new file mode 100644<br>
-index 0000000..7fd66eb<br>
---- /dev/null<br>
-+++ b/kexec/arch/arm64/iomem.h<br>
-@@ -0,0 +1,7 @@<br>
-+#ifndef IOMEM_H<br>
-+#define IOMEM_H<br>
-+<br>
-+#define SYSTEM_RAM "System RAM\n"<br>
-+#define IOMEM_RESERVED "reserved\n"<br>
-+<br>
-+#endif<br>
-diff --git a/kexec/arch/arm64/kexec-<wbr>arm64.c b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-index 2e8839a..8ac811d 100644<br>
---- a/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-@@ -21,6 +21,7 @@<br>
- #include "crashdump-arm64.h"<br>
- #include "dt-ops.h"<br>
- #include "fs2dt.h"<br>
-+#include "iomem.h"<br>
- #include "kexec-syscall.h"<br>
- #include "arch/options.h"<br>
-<br>
-@@ -475,7 +476,14 @@ static int get_memory_ranges_iomem_cb(<wbr>void *data, int nr, char *str,<br>
- return -1;<br>
-<br>
- r = (struct memory_range *)data + nr;<br>
-- r->type = RANGE_RAM;<br>
-+<br>
-+ if (!strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)))<br>
-+ r->type = RANGE_RAM;<br>
-+ else if (!strncmp(str, IOMEM_RESERVED, strlen(IOMEM_RESERVED)))<br>
-+ r->type = RANGE_RESERVED;<br>
-+ else<br>
-+ return 1;<br>
-+<br>
- r->start = base;<br>
- r->end = base + length - 1;<br>
-<br>
-@@ -494,7 +502,7 @@ static int get_memory_ranges_iomem_cb(<wbr>void *data, int nr, char *str,<br>
- static int get_memory_ranges_iomem(struct memory_range *array,<br>
- unsigned int *count)<br>
- {<br>
-- *count = kexec_iomem_for_each_line("<wbr>System RAM\n",<br>
-+ *count = kexec_iomem_for_each_line(<wbr>NULL,<br>
- get_memory_ranges_iomem_cb, array);<br>
-<br>
- if (!*count) {<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0004-arm64-kdump-<wbr>identify-memory-regions.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0004-arm64-kdump-<wbr>identify-memory-regions.patch<br>
deleted file mode 100644<br>
index 66600f3..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0004-arm64-kdump-<wbr>identify-memory-regions.patch<br>
+++ /dev/null<br>
@@ -1,202 +0,0 @@<br>
-From 48a4c7874d8264ddbfaec2e9858d78<wbr>66a2d2eb60 Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Wed, 5 Aug 2015 13:16:30 +0900<br>
-Subject: [PATCH 4/9] arm64: kdump: identify memory regions<br>
-<br>
-The following regions need to be identified for later use:<br>
- a) memory regions which belong to the 1st kernel<br>
- b) usable memory reserved for crash dump kernel<br>
-<br>
-We go through /proc/iomem to find out a) and b) which are marked<br>
-as "System RAM" and "Crash kernel", respectively.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/Makefile | 2 +<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.c | 100 ++++++++++++++++++++++++++++++<wbr>++++++-<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.h | 14 +++++-<br>
- kexec/arch/arm64/iomem.h | 1 +<br>
- 4 files changed, 114 insertions(+), 3 deletions(-)<br>
-<br>
-diff --git a/kexec/arch/arm64/Makefile b/kexec/arch/arm64/Makefile<br>
-index 74b677f..2d4ae0e 100644<br>
---- a/kexec/arch/arm64/Makefile<br>
-+++ b/kexec/arch/arm64/Makefile<br>
-@@ -6,6 +6,8 @@ arm64_FS2DT_INCLUDE += \<br>
-<br>
- arm64_DT_OPS += kexec/dt-ops.c<br>
-<br>
-+arm64_MEM_REGIONS = kexec/mem_regions.c<br>
-+<br>
- arm64_CPPFLAGS += -I $(srcdir)/kexec/<br>
-<br>
- arm64_KEXEC_SRCS += \<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.c b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-index d2272c8..dcaca43 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-@@ -1,5 +1,13 @@<br>
- /*<br>
- * ARM64 crashdump.<br>
-+ * partly derived from arm implementation<br>
-+ *<br>
-+ * Copyright (c) 2014-2016 Linaro Limited<br>
-+ * Author: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-+ *<br>
-+ * This program is free software; you can redistribute it and/or modify<br>
-+ * it under the terms of the GNU General Public License version 2 as<br>
-+ * published by the Free Software Foundation.<br>
- */<br>
-<br>
- #define _GNU_SOURCE<br>
-@@ -10,12 +18,102 @@<br>
- #include "kexec.h"<br>
- #include "crashdump.h"<br>
- #include "crashdump-arm64.h"<br>
-+#include "iomem.h"<br>
- #include "kexec-arm64.h"<br>
- #include "kexec-elf.h"<br>
-+#include "mem_regions.h"<br>
-<br>
--struct memory_ranges usablemem_rgns = {};<br>
-+/* memory ranges on crashed kernel */<br>
-+static struct memory_range crash_memory_ranges[CRASH_MAX_<wbr>MEMORY_RANGES];<br>
-+static struct memory_ranges crash_memory_rgns = {<br>
-+ .size = 0,<br>
-+ .max_size = CRASH_MAX_MEMORY_RANGES,<br>
-+ .ranges = crash_memory_ranges,<br>
-+};<br>
-+<br>
-+/* memory range reserved for crashkernel */<br>
-+struct memory_range crash_reserved_mem;<br>
-+struct memory_ranges usablemem_rgns = {<br>
-+ .size = 0,<br>
-+ .max_size = 1,<br>
-+ .ranges = &crash_reserved_mem,<br>
-+};<br>
-+<br>
-+/*<br>
-+ * iomem_range_callback() - callback called for each iomem region<br>
-+ * @data: not used<br>
-+ * @nr: not used<br>
-+ * @str: name of the memory region<br>
-+ * @base: start address of the memory region<br>
-+ * @length: size of the memory region<br>
-+ *<br>
-+ * This function is called once for each memory region found in /proc/iomem.<br>
-+ * It locates system RAM and crashkernel reserved memory and places these to<br>
-+ * variables, respectively, crash_memory_ranges and crash_reserved_mem.<br>
-+ */<br>
-+<br>
-+static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr),<br>
-+ char *str, unsigned long long base,<br>
-+ unsigned long long length)<br>
-+{<br>
-+ if (strncmp(str, CRASH_KERNEL, strlen(CRASH_KERNEL)) == 0)<br>
-+ return mem_regions_add(&usablemem_<wbr>rgns,<br>
-+ base, length, RANGE_RAM);<br>
-+ else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0)<br>
-+ return mem_regions_add(&crash_memory_<wbr>rgns,<br>
-+ base, length, RANGE_RAM);<br>
-+<br>
-+ return 0;<br>
-+}<br>
-<br>
- int is_crashkernel_mem_reserved(<wbr>void)<br>
- {<br>
-+ if (!crash_reserved_mem.end)<br>
-+ kexec_iomem_for_each_line(<wbr>NULL, iomem_range_callback, NULL);<br>
-+<br>
-+ return crash_reserved_mem.start != crash_reserved_mem.end;<br>
-+}<br>
-+<br>
-+/*<br>
-+ * crash_get_memory_ranges() - read system physical memory<br>
-+ *<br>
-+ * Function reads through system physical memory and stores found memory<br>
-+ * regions in crash_memory_ranges.<br>
-+ * Regions are sorted in ascending order.<br>
-+ *<br>
-+ * Returns 0 in case of success and -1 otherwise (errno is set).<br>
-+ */<br>
-+static int crash_get_memory_ranges(void)<br>
-+{<br>
-+ /*<br>
-+ * First read all memory regions that can be considered as<br>
-+ * system memory including the crash area.<br>
-+ */<br>
-+ if (!usablemem_rgns.size)<br>
-+ kexec_iomem_for_each_line(<wbr>NULL, iomem_range_callback, NULL);<br>
-+<br>
-+ /* allow only a single region for crash dump kernel */<br>
-+ if (usablemem_rgns.size != 1) {<br>
-+ errno = EINVAL;<br>
-+ return -1;<br>
-+ }<br>
-+<br>
-+ dbgprint_mem_range("Reserved memory range", &crash_reserved_mem, 1);<br>
-+<br>
-+ if (mem_regions_exclude(&crash_<wbr>memory_rgns, &crash_reserved_mem)) {<br>
-+ fprintf(stderr,<br>
-+ "Error: Number of crash memory ranges excedeed the max limit\n");<br>
-+ errno = ENOMEM;<br>
-+ return -1;<br>
-+ }<br>
-+<br>
-+ /*<br>
-+ * Make sure that the memory regions are sorted.<br>
-+ */<br>
-+ mem_regions_sort(&crash_<wbr>memory_rgns);<br>
-+<br>
-+ dbgprint_mem_range("Coredump memory ranges",<br>
-+ crash_memory_rgns.ranges, crash_memory_rgns.size);<br>
-+<br>
- return 0;<br>
- }<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.h b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-index f33c7a2..07a0ed0 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-@@ -1,12 +1,22 @@<br>
- /*<br>
- * ARM64 crashdump.<br>
-+ *<br>
-+ * Copyright (c) 2014-2016 Linaro Limited<br>
-+ * Author: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-+ *<br>
-+ * This program is free software; you can redistribute it and/or modify<br>
-+ * it under the terms of the GNU General Public License version 2 as<br>
-+ * published by the Free Software Foundation.<br>
- */<br>
-<br>
--#if !defined(CRASHDUMP_ARM64_H)<br>
-+#ifndef CRASHDUMP_ARM64_H<br>
- #define CRASHDUMP_ARM64_H<br>
-<br>
- #include "kexec.h"<br>
-<br>
-+#define CRASH_MAX_MEMORY_RANGES 32<br>
-+<br>
- extern struct memory_ranges usablemem_rgns;<br>
-+extern struct memory_range crash_reserved_mem;<br>
-<br>
--#endif<br>
-+#endif /* CRASHDUMP_ARM64_H */<br>
-diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h<br>
-index 7fd66eb..20cda87 100644<br>
---- a/kexec/arch/arm64/iomem.h<br>
-+++ b/kexec/arch/arm64/iomem.h<br>
-@@ -2,6 +2,7 @@<br>
- #define IOMEM_H<br>
-<br>
- #define SYSTEM_RAM "System RAM\n"<br>
-+#define CRASH_KERNEL "Crash kernel\n"<br>
- #define IOMEM_RESERVED "reserved\n"<br>
-<br>
- #endif<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0005-arm64-kdump-<wbr>add-elf-core-header-segment.<wbr>patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0005-arm64-kdump-<wbr>add-elf-core-header-segment.<wbr>patch<br>
deleted file mode 100644<br>
index fe535b6..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0005-arm64-kdump-<wbr>add-elf-core-header-segment.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,191 +0,0 @@<br>
-From 769da25627cebb2a53caee5d5be78a<wbr>32d376adc1 Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Wed, 5 Aug 2015 13:45:15 +0900<br>
-Subject: [PATCH 5/9] arm64: kdump: add elf core header segment<br>
-<br>
-Elf core header contains the information necessary for the coredump of<br>
-the 1st kernel, including its physcal memory layout as well as cpu register<br>
-states at the panic.<br>
-The segment is allocated inside the reserved memory of crash dump kernel.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.c | 96 ++++++++++++++++++++++++++++++<wbr>++++++++<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.h | 3 ++<br>
- kexec/arch/arm64/iomem.h | 2 +<br>
- kexec/arch/arm64/kexec-elf-<wbr>arm64.c | 10 ++++<br>
- 4 files changed, 111 insertions(+)<br>
-<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.c b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-index dcaca43..8346131 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-@@ -39,6 +39,39 @@ struct memory_ranges usablemem_rgns = {<br>
- .ranges = &crash_reserved_mem,<br>
- };<br>
-<br>
-+struct memory_range elfcorehdr_mem;<br>
-+<br>
-+static struct crash_elf_info elf_info = {<br>
-+ .class = ELFCLASS64,<br>
-+#if (__BYTE_ORDER == __LITTLE_ENDIAN)<br>
-+ .data = ELFDATA2LSB,<br>
-+#else<br>
-+ .data = ELFDATA2MSB,<br>
-+#endif<br>
-+ .machine = EM_AARCH64,<br>
-+};<br>
-+<br>
-+/*<br>
-+ * Note: The returned value is correct only if !CONFIG_RANDOMIZE_BASE.<br>
-+ */<br>
-+static uint64_t get_kernel_page_offset(void)<br>
-+{<br>
-+ int i;<br>
-+<br>
-+ if (elf_info.kern_vaddr_start == UINT64_MAX)<br>
-+ return UINT64_MAX;<br>
-+<br>
-+ /* Current max virtual memory range is 48-bits. */<br>
-+ for (i = 48; i > 0; i--)<br>
-+ if (!(elf_info.kern_vaddr_start & (1UL << i)))<br>
-+ break;<br>
-+<br>
-+ if (i <= 0)<br>
-+ return UINT64_MAX;<br>
-+ else<br>
-+ return UINT64_MAX << i;<br>
-+}<br>
-+<br>
- /*<br>
- * iomem_range_callback() - callback called for each iomem region<br>
- * @data: not used<br>
-@@ -62,6 +95,10 @@ static int iomem_range_callback(void *UNUSED(data), int UNUSED(nr),<br>
- else if (strncmp(str, SYSTEM_RAM, strlen(SYSTEM_RAM)) == 0)<br>
- return mem_regions_add(&crash_memory_<wbr>rgns,<br>
- base, length, RANGE_RAM);<br>
-+ else if (strncmp(str, KERNEL_CODE, strlen(KERNEL_CODE)) == 0)<br>
-+ elf_info.kern_paddr_start = base;<br>
-+ else if (strncmp(str, KERNEL_DATA, strlen(KERNEL_DATA)) == 0)<br>
-+ elf_info.kern_size = base + length - elf_info.kern_paddr_start;<br>
-<br>
- return 0;<br>
- }<br>
-@@ -115,5 +152,64 @@ static int crash_get_memory_ranges(void)<br>
- dbgprint_mem_range("Coredump memory ranges",<br>
- crash_memory_rgns.ranges, crash_memory_rgns.size);<br>
-<br>
-+ /*<br>
-+ * For additional kernel code/data segment.<br>
-+ * kern_paddr_start/kern_size are determined in iomem_range_callback<br>
-+ */<br>
-+ elf_info.kern_vaddr_start = get_kernel_sym("_text");<br>
-+ if (!elf_info.kern_vaddr_start)<br>
-+ elf_info.kern_vaddr_start = UINT64_MAX;<br>
-+<br>
-+ return 0;<br>
-+}<br>
-+<br>
-+/*<br>
-+ * load_crashdump_segments() - load the elf core header<br>
-+ * @info: kexec info structure<br>
-+ *<br>
-+ * This function creates and loads an additional segment of elf core header<br>
-+ : which is used to construct /proc/vmcore on crash dump kernel.<br>
-+ *<br>
-+ * Return 0 in case of success and -1 in case of error.<br>
-+ */<br>
-+<br>
-+int load_crashdump_segments(struct kexec_info *info)<br>
-+{<br>
-+ unsigned long elfcorehdr;<br>
-+ unsigned long bufsz;<br>
-+ void *buf;<br>
-+ int err;<br>
-+<br>
-+ /*<br>
-+ * First fetch all the memory (RAM) ranges that we are going to<br>
-+ * pass to the crash dump kernel during panic.<br>
-+ */<br>
-+<br>
-+ err = crash_get_memory_ranges();<br>
-+<br>
-+ if (err)<br>
-+ return err;<br>
-+<br>
-+ elf_info.page_offset = get_kernel_page_offset();<br>
-+ dbgprintf("%s: page_offset: %016llx\n", __func__,<br>
-+ elf_info.page_offset);<br>
-+<br>
-+ err = crash_create_elf64_headers(<wbr>info, &elf_info,<br>
-+ crash_memory_rgns.ranges, crash_memory_rgns.size,<br>
-+ &buf, &bufsz, ELF_CORE_HEADER_ALIGN);<br>
-+<br>
-+ if (err)<br>
-+ return err;<br>
-+<br>
-+ elfcorehdr = add_buffer_phys_virt(info, buf, bufsz, bufsz, 0,<br>
-+ crash_reserved_mem.start, crash_reserved_mem.end,<br>
-+ -1, 0);<br>
-+<br>
-+ elfcorehdr_mem.start = elfcorehdr;<br>
-+ elfcorehdr_mem.end = elfcorehdr + bufsz - 1;<br>
-+<br>
-+ dbgprintf("%s: elfcorehdr 0x%llx-0x%llx\n", __func__,<br>
-+ elfcorehdr_mem.start, elfcorehdr_mem.end);<br>
-+<br>
- return 0;<br>
- }<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.h b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-index 07a0ed0..da75a2d 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-@@ -18,5 +18,8 @@<br>
-<br>
- extern struct memory_ranges usablemem_rgns;<br>
- extern struct memory_range crash_reserved_mem;<br>
-+extern struct memory_range elfcorehdr_mem;<br>
-+<br>
-+extern int load_crashdump_segments(struct kexec_info *info);<br>
-<br>
- #endif /* CRASHDUMP_ARM64_H */<br>
-diff --git a/kexec/arch/arm64/iomem.h b/kexec/arch/arm64/iomem.h<br>
-index 20cda87..d4864bb 100644<br>
---- a/kexec/arch/arm64/iomem.h<br>
-+++ b/kexec/arch/arm64/iomem.h<br>
-@@ -2,6 +2,8 @@<br>
- #define IOMEM_H<br>
-<br>
- #define SYSTEM_RAM "System RAM\n"<br>
-+#define KERNEL_CODE "Kernel code\n"<br>
-+#define KERNEL_DATA "Kernel data\n"<br>
- #define CRASH_KERNEL "Crash kernel\n"<br>
- #define IOMEM_RESERVED "reserved\n"<br>
-<br>
-diff --git a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-index daf8bf0..c70a37a 100644<br>
---- a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-@@ -119,6 +119,16 @@ int elf_arm64_load(int argc, char **argv, const char *kernel_buf,<br>
- dbgprintf("%s: PE format: %s\n", __func__,<br>
- (arm64_header_check_pe_sig(<wbr>header) ? "yes" : "no"));<br>
-<br>
-+ if (info->kexec_flags & KEXEC_ON_CRASH) {<br>
-+ /* create and initialize elf core header segment */<br>
-+ result = load_crashdump_segments(info);<br>
-+ if (result) {<br>
-+ dbgprintf("%s: Creating eflcorehdr failed.\n",<br>
-+ __func__);<br>
-+ goto exit;<br>
-+ }<br>
-+ }<br>
-+<br>
- /* load the kernel */<br>
- result = elf_exec_load(&ehdr, info);<br>
-<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0006-arm64-kdump-<wbr>set-up-kernel-image-segment.<wbr>patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0006-arm64-kdump-<wbr>set-up-kernel-image-segment.<wbr>patch<br>
deleted file mode 100644<br>
index 4149551..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0006-arm64-kdump-<wbr>set-up-kernel-image-segment.<wbr>patch<br>
+++ /dev/null<br>
@@ -1,137 +0,0 @@<br>
-From 4079c93ac5453ef5f7889ab64920c1<wbr>e9427690ef Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Tue, 17 Feb 2015 16:06:55 +0900<br>
-Subject: [PATCH 6/9] arm64: kdump: set up kernel image segment<br>
-<br>
-On arm64, we can use the same kernel image as 1st kernel, but<br>
-we have to modify the entry point as well as segments' addresses<br>
-in the kernel's elf header in order to load them into correct places.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.c | 23 +++++++++++++++++++++++<br>
- kexec/arch/arm64/crashdump-<wbr>arm64.h | 1 +<br>
- kexec/arch/arm64/kexec-arm64.c | 25 ++++++++++++++++++++-----<br>
- kexec/arch/arm64/kexec-elf-<wbr>arm64.c | 10 +++++++++-<br>
- 4 files changed, 53 insertions(+), 6 deletions(-)<br>
-<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.c b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-index 8346131..9517329 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.c<br>
-@@ -213,3 +213,26 @@ int load_crashdump_segments(struct kexec_info *info)<br>
-<br>
- return 0;<br>
- }<br>
-+<br>
-+/*<br>
-+ * e_entry and p_paddr are actually in virtual address space.<br>
-+ * Those values will be translated to physcal addresses by<br>
-+ * using virt_to_phys().<br>
-+ * So let's get ready for later use so the memory base (phys_offset)<br>
-+ * will be correctly replaced with crash_reserved_mem.start.<br>
-+ */<br>
-+void modify_ehdr_for_crashdump(<wbr>struct mem_ehdr *ehdr)<br>
-+{<br>
-+ struct mem_phdr *phdr;<br>
-+ int i;<br>
-+<br>
-+ ehdr->e_entry += - arm64_mem.phys_offset + crash_reserved_mem.start;<br>
-+<br>
-+ for (i = 0; i < ehdr->e_phnum; i++) {<br>
-+ phdr = &ehdr->e_phdr[i];<br>
-+ if (phdr->p_type != PT_LOAD)<br>
-+ continue;<br>
-+ phdr->p_paddr +=<br>
-+ (-arm64_mem.phys_offset + crash_reserved_mem.start);<br>
-+ }<br>
-+}<br>
-diff --git a/kexec/arch/arm64/crashdump-<wbr>arm64.h b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-index da75a2d..382f571 100644<br>
---- a/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-+++ b/kexec/arch/arm64/crashdump-<wbr>arm64.h<br>
-@@ -21,5 +21,6 @@ extern struct memory_range crash_reserved_mem;<br>
- extern struct memory_range elfcorehdr_mem;<br>
-<br>
- extern int load_crashdump_segments(struct kexec_info *info);<br>
-+extern void modify_ehdr_for_crashdump(<wbr>struct mem_ehdr *ehdr);<br>
-<br>
- #endif /* CRASHDUMP_ARM64_H */<br>
-diff --git a/kexec/arch/arm64/kexec-<wbr>arm64.c b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-index 8ac811d..cec4e41 100644<br>
---- a/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-@@ -307,12 +307,27 @@ unsigned long arm64_locate_kernel_segment(<wbr>struct kexec_info *info)<br>
- {<br>
- unsigned long hole;<br>
-<br>
-- hole = locate_hole(info,<br>
-- arm64_mem.text_offset + arm64_mem.image_size,<br>
-- MiB(2), 0, ULONG_MAX, 1);<br>
-+ if (info->kexec_flags & KEXEC_ON_CRASH) {<br>
-+ unsigned long hole_end;<br>
-+<br>
-+ hole = (crash_reserved_mem.start < mem_min ?<br>
-+ mem_min : crash_reserved_mem.start);<br>
-+ hole = _ALIGN_UP(hole, MiB(2));<br>
-+ hole_end = hole + arm64_mem.text_offset + arm64_mem.image_size;<br>
-+<br>
-+ if ((hole_end > mem_max) ||<br>
-+ (hole_end > crash_reserved_mem.end)) {<br>
-+ dbgprintf("%s: Crash kernel out of range\n", __func__);<br>
-+ hole = ULONG_MAX;<br>
-+ }<br>
-+ } else {<br>
-+ hole = locate_hole(info,<br>
-+ arm64_mem.text_offset + arm64_mem.image_size,<br>
-+ MiB(2), 0, ULONG_MAX, 1);<br>
-<br>
-- if (hole == ULONG_MAX)<br>
-- dbgprintf("%s: locate_hole failed\n", __func__);<br>
-+ if (hole == ULONG_MAX)<br>
-+ dbgprintf("%s: locate_hole failed\n", __func__);<br>
-+ }<br>
-<br>
- return hole;<br>
- }<br>
-diff --git a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-index c70a37a..842ce21 100644<br>
---- a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-@@ -9,6 +9,7 @@<br>
- #include <stdlib.h><br>
- #include <linux/elf.h><br>
-<br>
-+#include "crashdump-arm64.h"<br>
- #include "kexec-arm64.h"<br>
- #include "kexec-elf.h"<br>
- #include "kexec-syscall.h"<br>
-@@ -105,7 +106,8 @@ int elf_arm64_load(int argc, char **argv, const char *kernel_buf,<br>
- }<br>
-<br>
- arm64_mem.vp_offset = _ALIGN_DOWN(ehdr.e_entry, MiB(2));<br>
-- arm64_mem.vp_offset -= kernel_segment - get_phys_offset();<br>
-+ if (!(info->kexec_flags & KEXEC_ON_CRASH))<br>
-+ arm64_mem.vp_offset -= kernel_segment - get_phys_offset();<br>
-<br>
- dbgprintf("%s: kernel_segment: %016lx\n", __func__, kernel_segment);<br>
- dbgprintf("%s: text_offset: %016lx\n", __func__,<br>
-@@ -127,6 +129,12 @@ int elf_arm64_load(int argc, char **argv, const char *kernel_buf,<br>
- __func__);<br>
- goto exit;<br>
- }<br>
-+<br>
-+ /*<br>
-+ * offset addresses in order to fit vmlinux<br>
-+ * (elf_exec) into crash kernel's memory<br>
-+ */<br>
-+ modify_ehdr_for_crashdump(&<wbr>ehdr);<br>
- }<br>
-<br>
- /* load the kernel */<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0007-arm64-kdump-<wbr>set-up-other-segments.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0007-arm64-kdump-<wbr>set-up-other-segments.patch<br>
deleted file mode 100644<br>
index 2745466..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0007-arm64-kdump-<wbr>set-up-other-segments.patch<br>
+++ /dev/null<br>
@@ -1,35 +0,0 @@<br>
-From 07ad14e12665221d754fde8e47c32a<wbr>c18c24586a Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Fri, 31 Jul 2015 20:01:39 +0900<br>
-Subject: [PATCH 7/9] arm64: kdump: set up other segments<br>
-<br>
-We make sure that all the other segments, initrd and device-tree blob,<br>
-also be loaded into the reserved memory of crash dump kernel.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/kexec-arm64.c | 5 ++++-<br>
- 1 file changed, 4 insertions(+), 1 deletion(-)<br>
-<br>
-diff --git a/kexec/arch/arm64/kexec-<wbr>arm64.c b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-index cec4e41..78a0035 100644<br>
---- a/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-@@ -374,7 +374,10 @@ int arm64_load_other_segments(<wbr>struct kexec_info *info,<br>
- /* Put the other segments after the image. */<br>
-<br>
- hole_min = image_base + arm64_mem.image_size;<br>
-- hole_max = ULONG_MAX;<br>
-+ if (info->kexec_flags & KEXEC_ON_CRASH)<br>
-+ hole_max = crash_reserved_mem.end;<br>
-+ else<br>
-+ hole_max = ULONG_MAX;<br>
-<br>
- if (arm64_opts.initrd) {<br>
- initrd_buf = slurp_file(arm64_opts.initrd, &initrd_size);<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0008-arm64-kdump-<wbr>add-DT-properties-to-crash-<wbr>dump-kernel-s.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0008-arm64-kdump-<wbr>add-DT-properties-to-crash-<wbr>dump-kernel-s.patch<br>
deleted file mode 100644<br>
index 31c3d85..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0008-arm64-kdump-<wbr>add-DT-properties-to-crash-<wbr>dump-kernel-s.patch<br>
+++ /dev/null<br>
@@ -1,150 +0,0 @@<br>
-From 23bf7ac189cc3b87ceb9d1d3b69b5c<wbr>4815354add Mon Sep 17 00:00:00 2001<br>
-From: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Date: Wed, 27 Jan 2016 13:38:39 +0900<br>
-Subject: [PATCH 8/9] arm64: kdump: add DT properties to crash dump kernel's<br>
- dtb<br>
-<br>
-We pass the following properties to crash dump kernel:<br>
-linux,elfcorehdr: elf core header segment,<br>
- same as "elfcorehdr=" kernel parameter on other archs<br>
-linux,usable-memory-range: usable memory reserved for crash dump kernel<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/kexec-arm64.c | 76 ++++++++++++++++++++++++++++++<wbr>+++++---<br>
- kexec/arch/arm64/kexec-elf-<wbr>arm64.c | 5 ---<br>
- 2 files changed, 71 insertions(+), 10 deletions(-)<br>
-<br>
-diff --git a/kexec/arch/arm64/kexec-<wbr>arm64.c b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-index 78a0035..a8fb64f 100644<br>
---- a/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-<wbr>arm64.c<br>
-@@ -128,9 +128,6 @@ int arch_process_options(int argc, char **argv)<br>
- case OPT_INITRD:<br>
- arm64_opts.initrd = optarg;<br>
- break;<br>
-- case OPT_PANIC:<br>
-- die("load-panic (-p) not supported");<br>
-- break;<br>
- default:<br>
- break; /* Ignore core and unknown options. */<br>
- }<br>
-@@ -285,8 +282,12 @@ on_success:<br>
- * setup_2nd_dtb - Setup the 2nd stage kernel's dtb.<br>
- */<br>
-<br>
--static int setup_2nd_dtb(struct dtb *dtb, char *command_line)<br>
-+static int setup_2nd_dtb(struct dtb *dtb, char *command_line, int on_crash)<br>
- {<br>
-+ char *new_buf;<br>
-+ int new_size;<br>
-+ int nodeoffset;<br>
-+ uint64_t range[2];<br>
- int result;<br>
-<br>
- result = fdt_check_header(dtb->buf);<br>
-@@ -298,8 +299,72 @@ static int setup_2nd_dtb(struct dtb *dtb, char *command_line)<br>
-<br>
- result = set_bootargs(dtb, command_line);<br>
-<br>
-+ /* remove those anyway */<br>
-+ nodeoffset = fdt_path_offset(dtb->buf, "/chosen");<br>
-+ fdt_delprop(dtb->buf, nodeoffset, "linux,crashkernel-base");<br>
-+ fdt_delprop(dtb->buf, nodeoffset, "linux,crashkernel-size");<br>
-+<br>
-+ if (on_crash) {<br>
-+ nodeoffset = fdt_path_offset(dtb->buf, "/chosen");<br>
-+ fdt_delprop(dtb->buf, nodeoffset, "linux,elfcorehdr");<br>
-+ fdt_delprop(dtb->buf, nodeoffset, "linux,usable-memory-range");<br>
-+ new_size = fdt_totalsize(dtb->buf)<br>
-+ + 2 * (sizeof(struct fdt_property)<br>
-+ + FDT_TAGALIGN(sizeof(range)))<br>
-+ + strlen("linux,elfcorehdr") + 1<br>
-+ + strlen("linux,usable-memory-<wbr>range") + 1;<br>
-+<br>
-+ new_buf = xmalloc(new_size);<br>
-+ result = fdt_open_into(dtb->buf, new_buf, new_size);<br>
-+ if (result) {<br>
-+ dbgprintf("%s: fdt_open_into failed: %s\n", __func__,<br>
-+ fdt_strerror(result));<br>
-+ result = -ENOSPC;<br>
-+ goto on_error;<br>
-+ }<br>
-+<br>
-+ range[0] = cpu_to_be64(elfcorehdr_mem.<wbr>start);<br>
-+ range[1] = cpu_to_be64(elfcorehdr_mem.end<br>
-+ - elfcorehdr_mem.start + 1);<br>
-+ nodeoffset = fdt_path_offset(new_buf, "/chosen");<br>
-+ result = fdt_setprop(new_buf, nodeoffset, "linux,elfcorehdr",<br>
-+ (void *)range, sizeof(range));<br>
-+ if (result) {<br>
-+ dbgprintf("%s: fdt_setprop failed: %s\n", __func__,<br>
-+ fdt_strerror(result));<br>
-+ result = -EINVAL;<br>
-+ goto on_error;<br>
-+ }<br>
-+<br>
-+ range[0] = cpu_to_be64(crash_reserved_<wbr>mem.start);<br>
-+ range[1] = cpu_to_be64(crash_reserved_<wbr>mem.end<br>
-+ - crash_reserved_mem.start + 1);<br>
-+ nodeoffset = fdt_path_offset(new_buf, "/chosen");<br>
-+ result = fdt_setprop(new_buf, nodeoffset,<br>
-+ "linux,usable-memory-range",<br>
-+ (void *)range, sizeof(range));<br>
-+ if (result) {<br>
-+ dbgprintf("%s: fdt_setprop failed: %s\n", __func__,<br>
-+ fdt_strerror(result));<br>
-+ result = -EINVAL;<br>
-+ goto on_error;<br>
-+ }<br>
-+<br>
-+ fdt_pack(new_buf);<br>
-+ dtb->buf = new_buf;<br>
-+ dtb->size = fdt_totalsize(new_buf);<br>
-+ }<br>
-+<br>
- dump_reservemap(dtb);<br>
-<br>
-+<br>
-+ return result;<br>
-+<br>
-+on_error:<br>
-+ fprintf(stderr, "kexec: %s failed.\n", __func__);<br>
-+ if (new_buf)<br>
-+ free(new_buf);<br>
-+<br>
- return result;<br>
- }<br>
-<br>
-@@ -366,7 +431,8 @@ int arm64_load_other_segments(<wbr>struct kexec_info *info,<br>
- }<br>
- }<br>
-<br>
-- result = setup_2nd_dtb(&dtb, command_line);<br>
-+ result = setup_2nd_dtb(&dtb, command_line,<br>
-+ info->kexec_flags & KEXEC_ON_CRASH);<br>
-<br>
- if (result)<br>
- return -EFAILED;<br>
-diff --git a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-index 842ce21..b17a31a 100644<br>
---- a/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-elf-<wbr>arm64.c<br>
-@@ -47,11 +47,6 @@ int elf_arm64_load(int argc, char **argv, const char *kernel_buf,<br>
- int result;<br>
- int i;<br>
-<br>
-- if (info->kexec_flags & KEXEC_ON_CRASH) {<br>
-- fprintf(stderr, "kexec: kdump not yet supported on arm64\n");<br>
-- return -EFAILED;<br>
-- }<br>
--<br>
- result = build_elf_exec_info(kernel_<wbr>buf, kernel_size, &ehdr, 0);<br>
-<br>
- if (result < 0) {<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0009-arm64-kdump-<wbr>Add-support-for-binary-image-<wbr>files.patch b/meta/recipes-kernel/kexec/<wbr>kexec-tools/0009-arm64-kdump-<wbr>Add-support-for-binary-image-<wbr>files.patch<br>
deleted file mode 100644<br>
index 8b1c018..0000000<br>
--- a/meta/recipes-kernel/kexec/<wbr>kexec-tools/0009-arm64-kdump-<wbr>Add-support-for-binary-image-<wbr>files.patch<br>
+++ /dev/null<br>
@@ -1,52 +0,0 @@<br>
-From 5a4958f01a793c3e7f440f5bae7566<wbr>6a4349cc50 Mon Sep 17 00:00:00 2001<br>
-From: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-Date: Thu, 14 May 2015 11:25:37 +0530<br>
-Subject: [PATCH 9/9] arm64: kdump: Add support for binary image files<br>
-<br>
-This patch adds support to use binary image ie arch/arm64/boot/Image with<br>
-kdump.<br>
-<br>
-Upstream-Status: Backport [<a href="https://git.linaro.org/people/takahiro.akashi/kexec-tools.git" rel="noreferrer" target="_blank">https://git.linaro.org/<wbr>people/takahiro.akashi/kexec-<wbr>tools.git</a>]<br>
-<br>
-Signed-off-by: Pratyush Anand <<a href="mailto:panand@redhat.com">panand@redhat.com</a>><br>
-[<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>: a bit reworked]<br>
-Signed-off-by: AKASHI Takahiro <<a href="mailto:takahiro.akashi@linaro.org">takahiro.akashi@linaro.org</a>><br>
-Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
----<br>
- kexec/arch/arm64/kexec-image-<wbr>arm64.c | 12 ++++++++++++<br>
- 1 file changed, 12 insertions(+)<br>
-<br>
-diff --git a/kexec/arch/arm64/kexec-<wbr>image-arm64.c b/kexec/arch/arm64/kexec-<wbr>image-arm64.c<br>
-index 960ed96..982e431 100644<br>
---- a/kexec/arch/arm64/kexec-<wbr>image-arm64.c<br>
-+++ b/kexec/arch/arm64/kexec-<wbr>image-arm64.c<br>
-@@ -4,7 +4,9 @@<br>
-<br>
- #define _GNU_SOURCE<br>
-<br>
-+#include "crashdump-arm64.h"<br>
- #include "kexec-arm64.h"<br>
-+#include "kexec-syscall.h"<br>
- #include <limits.h><br>
-<br>
- int image_arm64_probe(const char *kernel_buf, off_t kernel_size)<br>
-@@ -58,6 +60,16 @@ int image_arm64_load(int argc, char **argv, const char *kernel_buf,<br>
- dbgprintf("%s: PE format: %s\n", __func__,<br>
- (arm64_header_check_pe_sig(<wbr>header) ? "yes" : "no"));<br>
-<br>
-+ if (info->kexec_flags & KEXEC_ON_CRASH) {<br>
-+ /* create and initialize elf core header segment */<br>
-+ result = load_crashdump_segments(info);<br>
-+ if (result) {<br>
-+ dbgprintf("%s: Creating eflcorehdr failed.\n",<br>
-+ __func__);<br>
-+ goto exit;<br>
-+ }<br>
-+ }<br>
-+<br>
- /* load the kernel */<br>
- add_segment_phys_virt(info, kernel_buf, kernel_size,<br>
- kernel_segment + arm64_mem.text_offset,<br>
---<br>
-1.9.1<br>
-<br>
diff --git a/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.14.bb" rel="noreferrer" target="_blank">ke<wbr>xec-tools_2.0.14.bb</a> b/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.15.bb" rel="noreferrer" target="_blank">ke<wbr>xec-tools_2.0.15.bb</a><br>
similarity index 63%<br>
rename from meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.14.bb" rel="noreferrer" target="_blank">kexe<wbr>c-tools_2.0.14.bb</a><br>
rename to meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.15.bb" rel="noreferrer" target="_blank">kexe<wbr>c-tools_2.0.15.bb</a><br>
index 0f6398f1..6bd9025 100644<br>
--- a/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.14.bb" rel="noreferrer" target="_blank">ke<wbr>xec-tools_2.0.14.bb</a><br>
+++ b/meta/recipes-kernel/kexec/<a href="http://kexec-tools_2.0.15.bb" rel="noreferrer" target="_blank">ke<wbr>xec-tools_2.0.15.bb</a><br>
@@ -5,26 +5,13 @@ EXTRA_OECONF = " --with-zlib=yes"<br>
SRC_URI += "${KERNELORG_MIRROR}/linux/<wbr>utils/kernel/kexec/kexec-<wbr>tools-${PV}.tar.gz \<br>
file://0002-powerpc-change-<wbr>the-memory-size-limit.patch \<br>
file://0001-purgatory-Pass-r-<wbr>directly-to-linker.patch \<br>
- file://0001-vmcore-dmesg-<wbr>Define-_GNU_SOURCE.patch \<br>
- file://0001-kexec-exntend-the-<wbr>semantics-of-kexec_iomem_for_<wbr>each_.patch \<br>
- file://0002-kexec-generalize-<wbr>and-rename-get_kernel_stext_<wbr>sym.patch \<br>
- file://0003-arm64-identify-<wbr>PHYS_OFFSET-correctly.patch \<br>
- file://0004-arm64-kdump-<wbr>identify-memory-regions.patch \<br>
- file://0005-arm64-kdump-add-<wbr>elf-core-header-segment.patch \<br>
- file://0006-arm64-kdump-set-<wbr>up-kernel-image-segment.patch \<br>
- file://0007-arm64-kdump-set-<wbr>up-other-segments.patch \<br>
- file://0008-arm64-kdump-add-<wbr>DT-properties-to-crash-dump-<wbr>kernel-s.patch \<br>
- file://0009-arm64-kdump-Add-<wbr>support-for-binary-image-<wbr>files.patch \<br>
file://0010-kexec-ARM-Fix-add_<wbr>buffer_phys_virt-align-issue.<wbr>patch \<br>
- file://0001-x86-x86_64-Fix-<wbr>format-warning-with-die.patch \<br>
- file://0002-ppc-Fix-format-<wbr>warning-with-die.patch \<br>
file://kexec-x32.patch \<br>
file://0001-Disable-PIE-<wbr>during-link.patch \<br>
- file://0001-arm64-Disable-PIC.<wbr>patch \<br>
"<br>
<br>
-SRC_URI[md5sum] = "<wbr>b2b2c5e6b29d467d6e99d587fb6b7c<wbr>f5"<br>
-SRC_URI[sha256sum] = "<wbr>b3e69519d2acced256843b1e8f1ecf<wbr>a00d9b54fa07449ed78f05b9193f23<wbr>9370"<br>
+SRC_URI[md5sum] = "<wbr>78906fdc255656fa2b9996c8acb3ef<wbr>62"<br>
+SRC_URI[sha256sum] = "<wbr>42dbd0dab9964cd1ed89fa4571c8d1<wbr>3191eb7132b361ade5ac44517c91ec<wbr>b97e"<br>
<br>
SECURITY_PIE_CFLAGS_remove = "-fPIE -pie"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.7.4<br>
<br>
<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>