forked from pool/kexec-tools
107 lines
3.1 KiB
Diff
107 lines
3.1 KiB
Diff
From cd8497a9a9e487684679b6747f7ba3f0a557328b Mon Sep 17 00:00:00 2001
|
|
From: Chandru <chandru@in.ibm.com>
|
|
Date: Wed, 24 Sep 2008 17:19:18 +0530
|
|
Subject: [PATCH] kexec/kdump : add a new linux, usable-drconf-memory node to the device tree
|
|
|
|
Add a new linux,usable-drconf-memory property to the device tree passed to the
|
|
2nd kernel. Each entry in the property is of the form: a count followed by so
|
|
many (base, size) pairs of usable memory regions. The total number of such
|
|
entries is equal to number of lmb's in ibm,dynamic-memory property.
|
|
|
|
Signed-off-by: Chandru Siddalingappa <chandru@in.ibm.com>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
Acked-by: Bernhard Walle <bwalle@suse.de>
|
|
|
|
---
|
|
kexec/arch/ppc64/fs2dt.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 72 insertions(+)
|
|
|
|
--- a/kexec/arch/ppc64/fs2dt.c
|
|
+++ b/kexec/arch/ppc64/fs2dt.c
|
|
@@ -122,6 +122,74 @@ static unsigned propnum(const char *name
|
|
return offset;
|
|
}
|
|
|
|
+static void add_dyn_reconf_usable_mem_property(int fd)
|
|
+{
|
|
+ char fname[MAXPATH], *bname;
|
|
+ uint64_t buf[32];
|
|
+ uint64_t ranges[2*MAX_MEMORY_RANGES];
|
|
+ uint64_t base, end, loc_base, loc_end;
|
|
+ int range, rlen = 0, i;
|
|
+ int rngs_cnt, tmp_indx;
|
|
+
|
|
+ strcpy(fname, pathname);
|
|
+ bname = strrchr(fname, '/');
|
|
+ bname[0] = '\0';
|
|
+ bname = strrchr(fname, '/');
|
|
+ if (strncmp(bname, "/ibm,dynamic-reconfiguration-memory", 36))
|
|
+ return;
|
|
+
|
|
+ if (lseek(fd, 4, SEEK_SET) < 0)
|
|
+ die("unrecoverable error: error seeking in \"%s\": %s\n",
|
|
+ pathname, strerror(errno));
|
|
+
|
|
+ rlen = 0;
|
|
+ for (i = 0; i < num_of_lmbs; i++) {
|
|
+ if (read(fd, buf, 24) < 0)
|
|
+ die("unrecoverable error: error reading \"%s\": %s\n",
|
|
+ pathname, strerror(errno));
|
|
+
|
|
+ base = (uint64_t) buf[0];
|
|
+ end = base + lmb_size;
|
|
+ if (~0ULL - base < end)
|
|
+ die("unrecoverable error: mem property overflow\n");
|
|
+
|
|
+ tmp_indx = rlen++;
|
|
+
|
|
+ rngs_cnt = 0;
|
|
+ for (range = 0; range < usablemem_rgns.size; range++) {
|
|
+ loc_base = usablemem_rgns.ranges[range].start;
|
|
+ loc_end = usablemem_rgns.ranges[range].end;
|
|
+ if (loc_base >= base && loc_end <= end) {
|
|
+ ranges[rlen++] = loc_base;
|
|
+ ranges[rlen++] = loc_end - loc_base;
|
|
+ rngs_cnt++;
|
|
+ } else if (base < loc_end && end > loc_base) {
|
|
+ if (loc_base < base)
|
|
+ loc_base = base;
|
|
+ if (loc_end > end)
|
|
+ loc_end = end;
|
|
+ ranges[rlen++] = loc_base;
|
|
+ ranges[rlen++] = loc_end - loc_base;
|
|
+ rngs_cnt++;
|
|
+ }
|
|
+ }
|
|
+ /* Store the count of (base, size) duple */
|
|
+ ranges[tmp_indx] = rngs_cnt;
|
|
+ }
|
|
+
|
|
+ rlen = rlen * sizeof(uint64_t);
|
|
+ /*
|
|
+ * Add linux,drconf-usable-memory property.
|
|
+ */
|
|
+ *dt++ = 3;
|
|
+ *dt++ = rlen;
|
|
+ *dt++ = propnum("linux,drconf-usable-memory");
|
|
+ if ((rlen >= 8) && ((unsigned long)dt & 0x4))
|
|
+ dt++;
|
|
+ memcpy(dt, &ranges, rlen);
|
|
+ dt += (rlen + 3)/4;
|
|
+}
|
|
+
|
|
static void add_usable_mem_property(int fd, int len)
|
|
{
|
|
char fname[MAXPATH], *bname;
|
|
@@ -267,6 +335,10 @@ static void putprops(char *fn, struct di
|
|
dt += (len + 3)/4;
|
|
if (!strcmp(dp->d_name, "reg") && usablemem_rgns.size)
|
|
add_usable_mem_property(fd, len);
|
|
+ if (!strcmp(dp->d_name, "ibm,dynamic-memory") &&
|
|
+ usablemem_rgns.size)
|
|
+ add_dyn_reconf_usable_mem_property(fd);
|
|
+
|
|
close(fd);
|
|
}
|
|
|