080f64dafa
- Update to version 2.0.14 (bsc#1039937, FATE#320672, FATE#320671) Changelog: http://git.kernel.org/cgit/utils/kernel/kexec/kexec-tools.git/log/?id=refs/tags/v2.0.13..v2.0.14 - Backport upstream fixes (bsc#1039937, FATE#320672, FATE#320671) 0001-kexec-tools-2.0.14.git.patch 0002-ppc64-Reduce-number-of-ELF-LOAD-segments.patch 0003-kexec-Increase-the-upper-limit-for-RAM-segments.patch 0004-alpha-add-missing-__NR_kexec_load-definition.patch 0005-kexec-implemented-XEN-KEXEC-STATUS-to-determine-if-a.patch 0006-kexec-Remove-redundant-space-from-help-message.patch 0007-purgatory-Add-purgatory.map-and-purgatory.ro.sym-to-.patch 0008-kexec-Add-option-to-get-crash-kernel-region-size.patch 0009-crashdump-arm-Add-get_crash_kernel_load_range-functi.patch 0010-crashdump-arm64-Add-get_crash_kernel_load_range-func.patch 0011-crashdump-cris-Add-get_crash_kernel_load_range-funct.patch 0012-crashdump-ia64-Add-get_crash_kernel_load_range-funct.patch 0013-crashdump-m68k-Add-get_crash_kernel_load_range-funct.patch 0014-crashdump-mips-Add-get_crash_kernel_load_range-funct.patch 0015-crashdump-ppc-Add-get_crash_kernel_load_range-functi.patch 0016-crashdump-ppc64-Add-get_crash_kernel_load_range-func.patch 0017-crashdump-s390-Add-get_crash_kernel_load_range-funct.patch 0018-crashdump-sh-Add-get_crash_kernel_load_range-functio.patch 0019-gitignore-add-two-generated-files-in-purgatory.patch 0020-Only-print-debug-message-when-failed-to-serach-for-k.patch 0021-build_mem_phdrs-check-if-p_paddr-is-invalid.patch 0022-uImage-fix-realloc-pointer-confusion.patch 0023-uImage-Fix-uImage_load-for-little-endian-machines.patch 0024-uImage-Add-new-IH_ARCH_xxx-definitions.patch 0025-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0026-uImage-use-char-instead-of-unsigned-char-for-uImage_.patch 0027-arm64-add-uImage-support.patch OBS-URL: https://build.opensuse.org/request/show/500203 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=83
115 lines
3.3 KiB
Diff
115 lines
3.3 KiB
Diff
From e4280e22c8c45cab1f86860f1fc0beddda77a3a9 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Date: Fri, 17 Feb 2017 16:47:22 -0600
|
|
Subject: [PATCH 16/45] crashdump/ppc64: Add get_crash_kernel_load_range()
|
|
function
|
|
|
|
Implement get_crash_kernel_load_range() in support of
|
|
print crash kernel region size option.
|
|
|
|
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
---
|
|
kexec/arch/ppc64/crashdump-ppc64.c | 22 +++++++++++++++++++++-
|
|
kexec/arch/ppc64/kexec-ppc64.c | 24 ++++++++++++++++++++++++
|
|
kexec/arch/ppc64/kexec-ppc64.h | 2 ++
|
|
3 files changed, 47 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c
|
|
index f62b1599c162..5a71d5161c87 100644
|
|
--- a/kexec/arch/ppc64/crashdump-ppc64.c
|
|
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
|
|
@@ -36,6 +36,9 @@
|
|
#include "../../fs2dt.h"
|
|
#include "crashdump-ppc64.h"
|
|
|
|
+#define DEVTREE_CRASHKERNEL_BASE "/proc/device-tree/chosen/linux,crashkernel-base"
|
|
+#define DEVTREE_CRASHKERNEL_SIZE "/proc/device-tree/chosen/linux,crashkernel-size"
|
|
+
|
|
static struct crash_elf_info elf_info64 =
|
|
{
|
|
class: ELFCLASS64,
|
|
@@ -526,11 +529,28 @@ void add_usable_mem_rgns(unsigned long long base, unsigned long long size)
|
|
usablemem_rgns.size, base, size);
|
|
}
|
|
|
|
+int get_crash_kernel_load_range(uint64_t *start, uint64_t *end)
|
|
+{
|
|
+ unsigned long long value;
|
|
+
|
|
+ if (!get_devtree_value(DEVTREE_CRASHKERNEL_BASE, &value))
|
|
+ *start = value;
|
|
+ else
|
|
+ return -1;
|
|
+
|
|
+ if (!get_devtree_value(DEVTREE_CRASHKERNEL_SIZE, &value))
|
|
+ *end = *start + value - 1;
|
|
+ else
|
|
+ return -1;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int is_crashkernel_mem_reserved(void)
|
|
{
|
|
int fd;
|
|
|
|
- fd = open("/proc/device-tree/chosen/linux,crashkernel-base", O_RDONLY);
|
|
+ fd = open(DEVTREE_CRASHKERNEL_BASE, O_RDONLY);
|
|
if (fd < 0)
|
|
return 0;
|
|
close(fd);
|
|
diff --git a/kexec/arch/ppc64/kexec-ppc64.c b/kexec/arch/ppc64/kexec-ppc64.c
|
|
index 09ee0256ed05..6e8c175878a4 100644
|
|
--- a/kexec/arch/ppc64/kexec-ppc64.c
|
|
+++ b/kexec/arch/ppc64/kexec-ppc64.c
|
|
@@ -356,6 +356,30 @@ void scan_reserved_ranges(unsigned long kexec_flags, int *range_index)
|
|
*range_index = i;
|
|
}
|
|
|
|
+/* Return 0 if fname/value valid, -1 otherwise */
|
|
+int get_devtree_value(const char *fname, unsigned long long *value)
|
|
+{
|
|
+ FILE *file;
|
|
+ char buf[MAXBYTES];
|
|
+ int n = -1;
|
|
+
|
|
+ if ((file = fopen(fname, "r"))) {
|
|
+ n = fread(buf, 1, MAXBYTES, file);
|
|
+ fclose(file);
|
|
+ }
|
|
+
|
|
+ if (n == sizeof(uint32_t))
|
|
+ *value = ((uint32_t *)buf)[0];
|
|
+ else if (n == sizeof(uint64_t))
|
|
+ *value = ((uint64_t *)buf)[0];
|
|
+ else {
|
|
+ fprintf(stderr, "%s node has invalid size: %d\n", fname, n);
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* Get devtree details and create exclude_range array
|
|
* Also create usablemem_ranges for KEXEC_ON_CRASH
|
|
*/
|
|
diff --git a/kexec/arch/ppc64/kexec-ppc64.h b/kexec/arch/ppc64/kexec-ppc64.h
|
|
index 89ee94279301..633ae776dcdd 100644
|
|
--- a/kexec/arch/ppc64/kexec-ppc64.h
|
|
+++ b/kexec/arch/ppc64/kexec-ppc64.h
|
|
@@ -14,6 +14,8 @@
|
|
#define HAVE_DYNAMIC_MEMORY
|
|
#define NEED_RESERVE_DTB
|
|
|
|
+extern int get_devtree_value(const char *fname, unsigned long long *pvalue);
|
|
+
|
|
int setup_memory_ranges(unsigned long kexec_flags);
|
|
|
|
int elf_ppc64_probe(const char *buf, off_t len);
|
|
--
|
|
2.13.0
|
|
|