From: Eric DeVolder <eric.devolder@oracle.com>
To: horms@verge.net.au, kexec@lists.infradead.org,
andrew.cooper3@citrix.com, dyoung@redhat.com, panand@redhat.com
Cc: daniel.kiper@oracle.com, konrad.wilk@oracle.com
Subject: [PATCH v3 07/11] crashdump/ppc: Add get_crash_kernel_load_range() function
Date: Fri, 10 Feb 2017 16:07:38 -0600 [thread overview]
Message-ID: <1486764462-14176-8-git-send-email-eric.devolder@oracle.com> (raw)
In-Reply-To: <1486764462-14176-1-git-send-email-eric.devolder@oracle.com>
From: Daniel Kiper <daniel.kiper@oracle.com>
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>
---
kexec/arch/ppc/crashdump-powerpc.c | 22 +++++++++++++++++++++-
kexec/arch/ppc/kexec-ppc.c | 27 +++++++++++++++++++++++++++
kexec/arch/ppc/kexec-ppc.h | 1 +
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/kexec/arch/ppc/crashdump-powerpc.c b/kexec/arch/ppc/crashdump-powerpc.c
index 3dc35eb..fc5d70c 100644
--- a/kexec/arch/ppc/crashdump-powerpc.c
+++ b/kexec/arch/ppc/crashdump-powerpc.c
@@ -397,6 +397,27 @@ 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;
+ int ret = 0;
+
+ if (get_devtree_value("/proc/device-tree/chosen/linux,crashkernel-base", &value))
+ *start = value;
+ else {
+ *start = 0;
+ ret = -1;
+ }
+ if (get_devtree_value("/proc/device-tree/chosen/linux,crashkernel-size", &value))
+ *end = *start + value - 1;
+ else {
+ *end = 0;
+ ret = -1;
+ }
+
+ return ret;
+}
+
int is_crashkernel_mem_reserved(void)
{
int fd;
@@ -407,4 +428,3 @@ int is_crashkernel_mem_reserved(void)
close(fd);
return 1;
}
-
diff --git a/kexec/arch/ppc/kexec-ppc.c b/kexec/arch/ppc/kexec-ppc.c
index d046110..d9cdb9c 100644
--- a/kexec/arch/ppc/kexec-ppc.c
+++ b/kexec/arch/ppc/kexec-ppc.c
@@ -423,6 +423,33 @@ err_out:
return -1;
}
+int get_devtree_value(const char *fname, unsigned long long *pvalue)
+{
+ /* Return 1 if fname/value valid, 0 otherwise */
+ FILE *file;
+ char buf[MAXBYTES];
+ int ret = 1, n = -1;
+ unsigned long long value = 0;
+
+ 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);
+ ret = 0;
+ }
+
+ if (pvalue)
+ *pvalue = value;
+ return ret;
+}
+
/* Get devtree details and create exclude_range array
* Also create usablemem_ranges for KEXEC_ON_CRASH
*/
diff --git a/kexec/arch/ppc/kexec-ppc.h b/kexec/arch/ppc/kexec-ppc.h
index 904cf48..0e52d18 100644
--- a/kexec/arch/ppc/kexec-ppc.h
+++ b/kexec/arch/ppc/kexec-ppc.h
@@ -75,6 +75,7 @@ extern unsigned long dt_address_cells, dt_size_cells;
extern int init_memory_region_info(void);
extern int read_memory_region_limits(int fd, unsigned long long *start,
unsigned long long *end);
+extern int get_devtree_value (const char *fname, unsigned long long *pvalue);
#define COMMAND_LINE_SIZE 512 /* from kernel */
/*fs2dt*/
void reserve(unsigned long long where, unsigned long long length);
--
2.7.4
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2017-02-10 22:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 22:07 [PATCH v3 0/10] kexec: Add option to get crash kernel region size Eric DeVolder
2017-02-10 22:07 ` [PATCH v3 01/11] crashdump/arm: Add get_crash_kernel_load_range() function Eric DeVolder
2017-02-10 22:07 ` [PATCH v3 02/11] crashdump/arm64: " Eric DeVolder
2017-02-13 21:58 ` Daniel Kiper
2017-02-10 22:07 ` [PATCH v3 03/11] crashdump/cris: " Eric DeVolder
2017-02-13 21:59 ` Daniel Kiper
2017-02-10 22:07 ` [PATCH v3 04/11] crashdump/ia64: " Eric DeVolder
2017-02-10 22:07 ` [PATCH v3 05/11] crashdump/m68k: " Eric DeVolder
2017-02-13 22:01 ` Daniel Kiper
2017-02-10 22:07 ` [PATCH v3 06/11] crashdump/mips: " Eric DeVolder
2017-02-10 22:07 ` Eric DeVolder [this message]
2017-02-13 22:24 ` [PATCH v3 07/11] crashdump/ppc: " Daniel Kiper
2017-02-10 22:07 ` [PATCH v3 08/11] crashdump/ppc64: " Eric DeVolder
2017-02-13 22:26 ` Daniel Kiper
2017-02-10 22:07 ` [PATCH v3 09/11] crashdump/s390: " Eric DeVolder
2017-02-10 22:07 ` [PATCH v3 10/11] crashdump/sh: " Eric DeVolder
2017-02-10 22:07 ` [PATCH v3 11/11] kexec: Add option to get crash kernel region size Eric DeVolder
2017-02-13 22:41 ` Daniel Kiper
2017-02-13 4:23 ` [PATCH v3 0/10] " Pratyush Anand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1486764462-14176-8-git-send-email-eric.devolder@oracle.com \
--to=eric.devolder@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=daniel.kiper@oracle.com \
--cc=dyoung@redhat.com \
--cc=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=panand@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox