Add linux,usable-memory properties into device tree in case of
ibm,dynamic-reconfiguration-memory node of /proc/device-tree
Signed-off-by: Chandru Siddalingappa <chandru at in.ibm.com>
---
diff -Naurp kexec-tools-testing-orig/kexec/arch/ppc64/fs2dt.c
kexec-tools-testing/kexec/arch/ppc64/fs2dt.c
--- kexec-tools-testing-orig/kexec/arch/ppc64/fs2dt.c 2008-07-07
17:54:58.000000000 +0530
+++ kexec-tools-testing/kexec/arch/ppc64/fs2dt.c 2008-07-07 20:08:53.000000000
+0530
@@ -122,6 +122,80 @@ static unsigned propnum(const char *name
return offset;
}
+static void add_dyn_reconf_usable_mem_property(int fd)
+{
+ char fname[MAXPATH], propname[64], t[8], *bname;
+ const char tbuf[32];
+ uint64_t buf[32];
+ uint64_t ranges[2*MAX_MEMORY_RANGES];
+ uint64_t base, end, loc_base, loc_end;
+ int range, rlen = 0, i;
+
+ 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));
+
+ /* kernel counts the lmb's from 1, hence use i=1 here */
+ for (i = 1; i <= num_of_lmbs; i++) {
+ rlen = 0;
+ 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");
+
+ 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;
+ } 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;
+ }
+ }
+ if (!rlen) {
+ /*
+ * User did not pass any ranges for this region.
+ * Hence, write (0,0) duple in linux,usable-memory
+ * property such that this region will be ignored.
+ */
+ ranges[rlen++] = 0;
+ ranges[rlen++] = 0;
+ }
+
+ rlen = rlen * sizeof(uint64_t);
+ /*
+ * Add linux,usable-memory property.
+ */
+ *dt++ = 3;
+ *dt++ = rlen;
+ strcpy(tbuf, "linux,usable-memory");
+ sprintf(t, "%d", i);
+ strcat(tbuf, t);
+ *dt++ = propnum((const char *)tbuf);
+ 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 +341,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);
}
