You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
170 lines
5.9 KiB
170 lines
5.9 KiB
6 years ago
|
From 0300f611541ad8ec654898eebf03c8345f0263ca Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pingfan Liu <piliu@redhat.com>
|
||
|
|
Date: Mon, 21 Aug 2017 12:24:14 +0900
|
||
|
|
Subject: [PATCH 2/2] [PATCH v2 2/2] ppc64: get the info of mem reserved for
|
||
|
|
crashkernel
|
||
|
|
|
||
|
|
In kernel, ppc64 does not export the mem layout by ioresource. So we
|
||
|
|
need to get the mem info for crashkernel from device tree.
|
||
|
|
|
||
|
|
Signed-off-by: Pingfan Liu <piliu@redhat.com>
|
||
|
|
---
|
||
|
|
arch/ppc64.c | 36 ++++++++++++++++++++++++++++++++++++
|
||
|
|
makedumpfile.c | 3 +++
|
||
|
|
makedumpfile.h | 11 +++++++++++
|
||
|
|
3 files changed, 50 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/makedumpfile-1.6.2/arch/ppc64.c b/makedumpfile-1.6.2/arch/ppc64.c
|
||
|
|
index 3fd6002..bacac77 100644
|
||
|
|
--- a/makedumpfile-1.6.2/arch/ppc64.c
|
||
|
|
+++ b/makedumpfile-1.6.2/arch/ppc64.c
|
||
|
|
@@ -617,4 +617,40 @@ vaddr_to_paddr_ppc64(unsigned long vaddr)
|
||
|
|
return ppc64_vtop_level4(vaddr);
|
||
|
|
}
|
||
|
|
|
||
|
|
+int arch_crashkernel_mem_size_ppc64()
|
||
|
|
+{
|
||
|
|
+ const char f_crashsize[] = "/proc/device-tree/chosen/linux,crashkernel-size";
|
||
|
|
+ const char f_crashbase[] = "/proc/device-tree/chosen/linux,crashkernel-base";
|
||
|
|
+ unsigned long crashk_sz_be, crashk_sz;
|
||
|
|
+ unsigned long crashk_base_be, crashk_base;
|
||
|
|
+ uint swap;
|
||
|
|
+ FILE *fp, *fpb;
|
||
|
|
+
|
||
|
|
+ fp = fopen(f_crashsize, "r");
|
||
|
|
+ if (!fp) {
|
||
|
|
+ ERRMSG("Cannot open %s\n", f_crashsize);
|
||
|
|
+ return FALSE;
|
||
|
|
+ }
|
||
|
|
+ fpb = fopen(f_crashbase, "r");
|
||
|
|
+ if (!fp) {
|
||
|
|
+ ERRMSG("Cannot open %s\n", f_crashbase);
|
||
|
|
+ fclose(fp);
|
||
|
|
+ return FALSE;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ fread(&crashk_sz_be, sizeof(crashk_sz_be), 1, fp);
|
||
|
|
+ fread(&crashk_base_be, sizeof(crashk_base_be), 1, fpb);
|
||
|
|
+ fclose(fp);
|
||
|
|
+ fclose(fpb);
|
||
|
|
+ /* dev tree is always big endian */
|
||
|
|
+ swap = !is_bigendian();
|
||
|
|
+ crashk_sz = swap64(crashk_sz_be, swap);
|
||
|
|
+ crashk_base = swap64(crashk_base_be, swap);
|
||
|
|
+ crash_reserved_mem_nr = 1;
|
||
|
|
+ crash_reserved_mem[0].start = crashk_base;
|
||
|
|
+ crash_reserved_mem[0].end = crashk_base + crashk_sz - 1;
|
||
|
|
+
|
||
|
|
+ return TRUE;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
#endif /* powerpc64 */
|
||
|
|
diff --git a/makedumpfile-1.6.2/makedumpfile.c b/makedumpfile-1.6.2/makedumpfile.c
|
||
|
|
index 5096319..567ac5d 100644
|
||
|
|
--- a/makedumpfile-1.6.2/makedumpfile.c
|
||
|
|
+++ b/makedumpfile-1.6.2/makedumpfile.c
|
||
|
|
@@ -10945,6 +10945,9 @@ int is_crashkernel_mem_reserved(void)
|
||
|
|
{
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
+ if (arch_crashkernel_mem_size())
|
||
|
|
+ return TRUE;
|
||
|
|
+
|
||
|
|
ret = iomem_for_each_line("Crash kernel\n",
|
||
|
|
crashkernel_mem_callback, NULL);
|
||
|
|
crash_reserved_mem_nr = ret;
|
||
|
|
diff --git a/makedumpfile-1.6.2/makedumpfile.h b/makedumpfile-1.6.2/makedumpfile.h
|
||
|
|
index 6f188e4..7d81bbc 100644
|
||
|
|
--- a/makedumpfile-1.6.2/makedumpfile.h
|
||
|
|
+++ b/makedumpfile-1.6.2/makedumpfile.h
|
||
|
|
@@ -936,6 +936,7 @@ int get_xen_info_arm64(void);
|
||
|
|
#define get_xen_basic_info_arch(X) get_xen_basic_info_arm64(X)
|
||
|
|
#define get_xen_info_arch(X) get_xen_info_arm64(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* aarch64 */
|
||
|
|
|
||
|
|
#ifdef __arm__
|
||
|
|
@@ -949,6 +950,7 @@ unsigned long long vaddr_to_paddr_arm(unsigned long vaddr);
|
||
|
|
#define get_kaslr_offset(X) stub_false()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_arm(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* arm */
|
||
|
|
|
||
|
|
#ifdef __x86__
|
||
|
|
@@ -962,6 +964,7 @@ unsigned long long vaddr_to_paddr_x86(unsigned long vaddr);
|
||
|
|
#define get_kaslr_offset(X) stub_false()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_x86(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* x86 */
|
||
|
|
|
||
|
|
#ifdef __x86_64__
|
||
|
|
@@ -977,12 +980,14 @@ unsigned long long vtop4_x86_64(unsigned long vaddr);
|
||
|
|
#define get_kaslr_offset(X) get_kaslr_offset_x86_64(X)
|
||
|
|
#define vaddr_to_paddr(X) vtop4_x86_64(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* x86_64 */
|
||
|
|
|
||
|
|
#ifdef __powerpc64__ /* powerpc64 */
|
||
|
|
int get_machdep_info_ppc64(void);
|
||
|
|
int get_versiondep_info_ppc64(void);
|
||
|
|
unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr);
|
||
|
|
+int arch_crashkernel_mem_size_ppc64(void);
|
||
|
|
#define find_vmemmap() stub_false()
|
||
|
|
#define get_phys_base() stub_true()
|
||
|
|
#define get_machdep_info() get_machdep_info_ppc64()
|
||
|
|
@@ -990,6 +995,7 @@ unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr);
|
||
|
|
#define get_kaslr_offset(X) stub_false()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_ppc64(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() arch_crashkernel_mem_size_ppc64()
|
||
|
|
#endif /* powerpc64 */
|
||
|
|
|
||
|
|
#ifdef __powerpc32__ /* powerpc32 */
|
||
|
|
@@ -1002,6 +1008,7 @@ unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr);
|
||
|
|
#define get_kaslr_offset(X) stub_false()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_ppc(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* powerpc32 */
|
||
|
|
|
||
|
|
#ifdef __s390x__ /* s390x */
|
||
|
|
@@ -1015,6 +1022,7 @@ int is_iomem_phys_addr_s390x(unsigned long addr);
|
||
|
|
#define get_kaslr_offset(X) stub_false()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_s390x(X)
|
||
|
|
#define is_phys_addr(X) is_iomem_phys_addr_s390x(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* s390x */
|
||
|
|
|
||
|
|
#ifdef __ia64__ /* ia64 */
|
||
|
|
@@ -1029,6 +1037,7 @@ unsigned long long vaddr_to_paddr_ia64(unsigned long vaddr);
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_ia64(X)
|
||
|
|
#define VADDR_REGION(X) (((unsigned long)(X)) >> REGION_SHIFT)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* ia64 */
|
||
|
|
|
||
|
|
#ifdef __sparc64__ /* sparc64 */
|
||
|
|
@@ -1041,6 +1050,7 @@ unsigned long long vaddr_to_paddr_sparc64(unsigned long vaddr);
|
||
|
|
#define get_versiondep_info() get_versiondep_info_sparc64()
|
||
|
|
#define vaddr_to_paddr(X) vaddr_to_paddr_sparc64(X)
|
||
|
|
#define is_phys_addr(X) stub_true_ul(X)
|
||
|
|
+#define arch_crashkernel_mem_size() stub_false()
|
||
|
|
#endif /* sparc64 */
|
||
|
|
|
||
|
|
typedef unsigned long long mdf_pfn_t;
|
||
|
|
@@ -1942,6 +1952,7 @@ int iomem_for_each_line(char *match, int (*callback)(void *data, int nr,
|
||
|
|
unsigned long base,
|
||
|
|
unsigned long length),
|
||
|
|
void *data);
|
||
|
|
+int is_bigendian(void);
|
||
|
|
|
||
|
|
|
||
|
|
/*
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|