[PATCH 1/1] bootwrapper: add flat device tree support code

[PATCH 1/1] bootwrapper: add flat device tree support code

[Mark A. Greer]

This patch adds a copy of the flat device tree code to the bootwrapper.
This code is only a copy of what exists in a mercurial repository that
can be cloned:
	"hg clone http://unsanctioned.org/flatdevtree/hgweb.py flatdevtree"

Do not edit this file in the bootwrapper, send patches to
Hollis Blanchard <hollisb@us.ibm.com> and CC: Linuxppc-dev@ozlabs.org.

Signed-off-by: Mark A. Greer <mgreer@mvista.com>
--

 Makefile      |    2 
 flatdevtree.c |  628 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 flatdevtree.h |  106 +++++++++
 3 files changed, 735 insertions(+), 1 deletion(-)
--

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 44a3055..1c4f11b 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -40,7 +40,7 @@ src-boot := crt0.S string.S stdio.c main
 ifeq ($(CONFIG_PPC_MULTIPLATFORM),y)
 src-boot += of.c
 else
-src-boot += flatdevtree_misc.c
+src-boot += flatdevtree.c flatdevtree_misc.c
 endif
 ifeq ($(CONFIG_SANDPOINT),y)
 src-boot += sandpoint.c mpc10x.c simple_alloc.c serial.c ns16550.c util.S
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
new file mode 100644
index 0000000..a8d9722
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -0,0 +1,628 @@
+/*
+ * DO NOT EDIT THIS FILE!!
+ *
+ * The master copy is kept in a mercurial repository that you can clone:
+ *	"hg clone http://unsanctioned.org/flatdevtree/hgweb.py flatdevtree"
+ * Please send patches to Hollis Blanchard <hollisb@us.ibm.com> and
+ * CC: <Linuxppc-dev@ozlabs.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright Pantelis Antoniou 2006
+ * Copyright (C) IBM Corporation 2006
+ * 2006 (c) MontaVista Software, Inc.
+ *
+ * Authors: Pantelis Antoniou <pantelis@embeddedalley.com>
+ *          Hollis Blanchard <hollisb@us.ibm.com>
+ *          Mark A. Greer <mgreer@mvista.com>
+ */
+
+#include "flatdevtree.h"
+
+struct ft_entity {
+	u32	*tagp;		/* Ptr to tag field */
+	char	*name;		/* Name of node or property; else NULL */
+	char	*datap;		/* Ptr to data, if property; else NULL */
+	u32	*sizep;		/* Ptr to propery size; else NULL */
+};
+
+/* Set ptrs to current one's info; return addr of next one */
+static u32 *ft_next(u32 *p, const void *bphp, struct ft_entity *ftep)
+{
+	const struct boot_param_header *bph = bphp;
+	const u32 *p_strings = (const u32 *)
+		((const char *)bph + be32_to_cpu(bph->off_dt_strings));
+	const u32 version = be32_to_cpu(bph->version);
+	u32 sz;
+
+	if (p == NULL) /* Start at top of tree */
+		p = (u32 *)((char *)bph + be32_to_cpu(bph->off_dt_struct));
+
+	ftep->name = NULL;
+	ftep->datap = NULL;
+	ftep->sizep = NULL;
+	ftep->tagp = p;
+
+	switch (be32_to_cpu(*p++)) { /* Tag */
+	case OF_DT_BEGIN_NODE:
+		ftep->name = (char *)p;
+		p = (u32 *)_ALIGN((unsigned long)p + strlen((char *)p) + 1, 4);
+		break;
+	case OF_DT_PROP:
+		sz = be32_to_cpu(*p);
+		ftep->sizep = p++;
+		ftep->name = (char *)p_strings + be32_to_cpu(*p++);
+		if ((version < 0x10) && (sz >= 8))
+			p = (u32 *)_ALIGN((unsigned long)p, 8);
+		ftep->datap = (char *)p;
+		p = (u32 *)_ALIGN((unsigned long)p + sz, 4);
+		break;
+	case OF_DT_END_NODE:
+	case OF_DT_NOP:
+		break;
+	case OF_DT_END:
+	default:
+		p = NULL;
+		break;
+	}
+
+	return p;
+}
+
+static void ft_put_word(struct ft_cxt *cxt, u32 v)
+{
+	if (cxt->overflow)	/* do nothing */
+		return;
+
+	/* check for overflow */
+	if (cxt->p + 4 > cxt->pstr) {
+		cxt->overflow = 1;
+		return;
+	}
+
+	*(u32 *) cxt->p = cpu_to_be32(v);
+	cxt->p += 4;
+}
+
+static inline void ft_put_bin(struct ft_cxt *cxt, const void *data, int sz)
+{
+	char *p;
+
+	if (cxt->overflow)	/* do nothing */
+		return;
+
+	/* next pointer pos */
+	p = (char *) _ALIGN((unsigned long)cxt->p + sz, 4);
+
+	/* check for overflow */
+	if (p > cxt->pstr) {
+		cxt->overflow = 1;
+		return;
+	}
+
+	memcpy(cxt->p, data, sz);
+	if ((sz & 3) != 0)
+		memset(cxt->p + sz, 0, 4 - (sz & 3));
+	cxt->p = p;
+}
+
+void ft_begin_node(struct ft_cxt *cxt, const char *name)
+{
+	ft_put_word(cxt, OF_DT_BEGIN_NODE);
+	ft_put_bin(cxt, name, strlen(name) + 1);
+}
+
+void ft_end_node(struct ft_cxt *cxt)
+{
+	ft_put_word(cxt, OF_DT_END_NODE);
+}
+
+void ft_nop(struct ft_cxt *cxt)
+{
+	ft_put_word(cxt, OF_DT_NOP);
+}
+
+static int lookup_string(struct ft_cxt *cxt, const char *name)
+{
+	char *p;
+
+	p = cxt->pstr;
+	while (p < cxt->pstr_begin) {
+		if (strcmp(p, (char *)name) == 0)
+			return p - cxt->p_begin;
+		p += strlen(p) + 1;
+	}
+
+	return -1;
+}
+
+void ft_prop(struct ft_cxt *cxt, const char *name,
+		const void *data, unsigned int sz)
+{
+	int len, off;
+
+	if (cxt->overflow)
+		return;
+
+	len = strlen(name) + 1;
+
+	off = lookup_string(cxt, name);
+	if (off == -1) {
+		/* check if we have space */
+		if (cxt->p + 12 + sz + len > cxt->pstr) {
+			cxt->overflow = 1;
+			return;
+		}
+
+		cxt->pstr -= len;
+		memcpy(cxt->pstr, name, len);
+		off = cxt->pstr - cxt->p_begin;
+	}
+
+	/* now put offset from beginning of *STRUCTURE* */
+	/* will be fixed up at the end */
+	ft_put_word(cxt, OF_DT_PROP);
+	ft_put_word(cxt, sz);
+	ft_put_word(cxt, off);
+	ft_put_bin(cxt, data, sz);
+}
+
+void ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str)
+{
+	ft_prop(cxt, name, str, strlen(str) + 1);
+}
+
+void ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val)
+{
+	u32 v = cpu_to_be32((u32) val);
+
+	ft_prop(cxt, name, &v, 4);
+}
+
+/* start construction of the flat OF tree */
+void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size)
+{
+	struct boot_param_header *bph = blob;
+	u32 off;
+
+	/* clear the cxt */
+	memset(cxt, 0, sizeof(*cxt));
+
+	cxt->bph = bph;
+	cxt->max_size = max_size;
+
+	/* zero everything in the header area */
+	memset(bph, 0, sizeof(*bph));
+
+	bph->magic = cpu_to_be32(OF_DT_HEADER);
+	bph->version = cpu_to_be32(0x10);
+	bph->last_comp_version = cpu_to_be32(0x10);
+
+	/* start pointers */
+	cxt->pres_begin = (char *) _ALIGN((unsigned long)(bph + 1), 8);
+	cxt->pres = cxt->pres_begin;
+
+	off = (unsigned long)cxt->pres_begin - (unsigned long)bph;
+	bph->off_mem_rsvmap = cpu_to_be32(off);
+
+	((u64 *) cxt->pres)[0] = 0;	/* phys = 0, size = 0, terminate */
+	((u64 *) cxt->pres)[1] = 0;
+
+	cxt->p_anchor = cxt->pres + 16;	/* over the terminator */
+}
+
+/* add a reserver physical area to the rsvmap */
+void ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size)
+{
+	((u64 *) cxt->pres)[0] = cpu_to_be64(physaddr);	/* phys = 0, size = 0, terminate */
+	((u64 *) cxt->pres)[1] = cpu_to_be64(size);
+
+	cxt->pres += 18;	/* advance */
+
+	((u64 *) cxt->pres)[0] = 0;	/* phys = 0, size = 0, terminate */
+	((u64 *) cxt->pres)[1] = 0;
+
+	/* keep track of size */
+	cxt->res_size = cxt->pres + 16 - cxt->pres_begin;
+
+	cxt->p_anchor = cxt->pres + 16;	/* over the terminator */
+}
+
+void ft_begin_tree(struct ft_cxt *cxt)
+{
+	cxt->p_begin = cxt->p_anchor;
+	cxt->pstr_begin = (char *)cxt->bph + cxt->max_size;	/* point at the end */
+
+	cxt->p = cxt->p_begin;
+	cxt->pstr = cxt->pstr_begin;
+}
+
+int ft_end_tree(struct ft_cxt *cxt)
+{
+	struct boot_param_header *bph = cxt->bph;
+	int off, sz, sz1;
+	u32 tag, v;
+	char *p;
+
+	ft_put_word(cxt, OF_DT_END);
+
+	if (cxt->overflow)
+		return -ENOMEM;
+
+	/* size of the areas */
+	cxt->struct_size = cxt->p - cxt->p_begin;
+	cxt->strings_size = cxt->pstr_begin - cxt->pstr;
+
+	/* the offset we must move */
+	off = (cxt->pstr_begin - cxt->p_begin) - cxt->strings_size;
+
+	/* the new strings start */
+	cxt->pstr_begin = cxt->p_begin + cxt->struct_size;
+
+	/* move the whole string area */
+	memmove(cxt->pstr_begin, cxt->pstr, cxt->strings_size);
+
+	/* now perform the fixup of the strings */
+	p = cxt->p_begin;
+	while ((tag = be32_to_cpu(*(u32 *) p)) != OF_DT_END) {
+		p += 4;
+
+		if (tag == OF_DT_BEGIN_NODE) {
+			p = (char *) _ALIGN((unsigned long)p + strlen(p) + 1, 4);
+			continue;
+		}
+
+		if (tag == OF_DT_END_NODE || tag == OF_DT_NOP)
+			continue;
+
+		if (tag != OF_DT_PROP)
+			return -EINVAL;
+
+		sz = be32_to_cpu(*(u32 *) p);
+		p += 4;
+
+		v = be32_to_cpu(*(u32 *) p);
+		v -= off;
+		*(u32 *) p = cpu_to_be32(v);	/* move down */
+		p += 4;
+
+		p = (char *) _ALIGN((unsigned long)p + sz, 4);
+	}
+
+	/* fix sizes */
+	p = (char *)cxt->bph;
+	sz = (cxt->pstr_begin + cxt->strings_size) - p;
+	sz1 = _ALIGN(sz, 16);	/* align at 16 bytes */
+	if (sz != sz1)
+		memset(p + sz, 0, sz1 - sz);
+	bph->totalsize = cpu_to_be32(sz1);
+	bph->off_dt_struct = cpu_to_be32(cxt->p_begin - p);
+	bph->off_dt_strings = cpu_to_be32(cxt->pstr_begin - p);
+
+	/* the new strings start */
+	cxt->pstr_begin = cxt->p_begin + cxt->struct_size;
+	cxt->pstr = cxt->pstr_begin + cxt->strings_size;
+
+	return 0;
+}
+
+/**********************************************************************/
+
+static inline int isprint(int c)
+{
+	return c >= 0x20 && c <= 0x7e;
+}
+
+static int is_printable_string(const void *data, int len)
+{
+	const char *s = data;
+	const char *ss;
+
+	/* zero length is not */
+	if (len == 0)
+		return 0;
+
+	/* must terminate with zero */
+	if (s[len - 1] != '\0')
+		return 0;
+
+	ss = s;
+	while (*s && isprint(*s))
+		s++;
+
+	/* not zero, or not done yet */
+	if (*s != '\0' || (s + 1 - ss) < len)
+		return 0;
+
+	return 1;
+}
+
+static void print_data(const void *data, int len)
+{
+	int i;
+	const char *s;
+
+	/* no data, don't print */
+	if (len == 0)
+		return;
+
+	if (is_printable_string(data, len)) {
+		printf(" = \"%s\"", (char *)data);
+		return;
+	}
+
+	switch (len) {
+	case 1:		/* byte */
+		printf(" = <0x%02x>", (*(char *) data) & 0xff);
+		break;
+	case 2:		/* half-word */
+		printf(" = <0x%04x>", be16_to_cpu(*(u16 *) data) & 0xffff);
+		break;
+	case 4:		/* word */
+		printf(" = <0x%08x>", be32_to_cpu(*(u32 *) data) & 0xffffffffU);
+		break;
+	case 8:		/* double-word */
+		printf(" = <0x%16llx>", be64_to_cpu(*(u64 *) data));
+		break;
+	default:		/* anything else... hexdump */
+		printf(" = [");
+		for (i = 0, s = data; i < len; i++)
+			printf("%02x%s", s[i], i < len - 1 ? " " : "");
+		printf("]");
+
+		break;
+	}
+}
+
+void ft_dump_blob(const void *bphp)
+{
+	const struct boot_param_header *bph = bphp;
+	const u64 *p_rsvmap = (const u64 *)
+		((const char *)bph + be32_to_cpu(bph->off_mem_rsvmap));
+	struct ft_entity fte;
+	u32 i, *p;
+	int depth, shift;
+	u64 addr, size;
+
+
+	if (be32_to_cpu(bph->magic) != OF_DT_HEADER) {
+		/* not valid tree */
+		return;
+	}
+
+	depth = 0;
+	shift = 4;
+
+	for (i = 0;; i++) {
+		addr = be64_to_cpu(p_rsvmap[i * 2]);
+		size = be64_to_cpu(p_rsvmap[i * 2 + 1]);
+		if (addr == 0 && size == 0)
+			break;
+
+		printf("/memreserve/ 0x%llx 0x%llx;\n", addr, size);
+	}
+
+	p = NULL;
+	while ((p = ft_next(p, bphp, &fte)) != NULL)
+		switch (be32_to_cpu(*fte.tagp)) {
+		case OF_DT_BEGIN_NODE:
+			printf("%*s%s {\n", depth * shift, "", fte.name);
+			depth++;
+			break;
+		case OF_DT_END_NODE:
+			depth--;
+			printf("%*s};\n", depth * shift, "");
+			break;
+		case OF_DT_NOP:
+			printf("%*s[NOP]\n", depth * shift, "");
+			break;
+		case OF_DT_END:
+			break;
+		case OF_DT_PROP:
+			printf("%*s%s", depth * shift, "", fte.name);
+			print_data(fte.datap, *fte.sizep);
+			printf(";\n");
+			break;
+		default:
+			fprintf(stderr, "%*s ** Unknown tag 0x%08x\n",
+				depth * shift, "", *fte.tagp);
+			return;
+		}
+}
+
+void ft_backtrack_node(struct ft_cxt *cxt)
+{
+	if (be32_to_cpu(*(u32 *) (cxt->p - 4)) != OF_DT_END_NODE)
+		return;		/* XXX only for node */
+
+	cxt->p -= 4;
+}
+
+/* note that the root node of the blob is "peeled" off */
+void ft_merge_blob(struct ft_cxt *cxt, void *blob)
+{
+	struct ft_entity fte;
+	u32 *p;
+	int depth;
+
+	if (be32_to_cpu(*(u32 *) (cxt->p - 4)) != OF_DT_END_NODE)
+		return;		/* XXX only for node */
+
+	cxt->p -= 4;
+
+	depth = 0;
+	p = NULL;
+	while ((p = ft_next(p, blob, &fte)) != NULL)
+		switch (be32_to_cpu(*fte.tagp)) {
+		case OF_DT_BEGIN_NODE:
+			if (depth++ > 0)
+				ft_begin_node(cxt, fte.name);
+			break;
+		case OF_DT_END_NODE:
+			ft_end_node(cxt);
+			if (--depth == 0)
+				return;
+			break;
+		case OF_DT_PROP:
+			ft_prop(cxt, fte.name, fte.datap, *fte.sizep);
+			break;
+		}
+}
+
+/**********************************************************************/
+
+void *ft_find_node(const void *bphp, const char *srch_path)
+{
+	struct ft_entity fte;
+	u32 *p;
+	static char path[MAX_PATH_LEN];
+
+	path[0] = '\0';
+	p = NULL;
+	while ((p = ft_next(p, bphp, &fte)) != NULL)
+		switch (be32_to_cpu(*fte.tagp)) {
+		case OF_DT_BEGIN_NODE:
+			strcat(path, fte.name);
+			if (!strcmp(path, srch_path))
+				return fte.tagp;
+			strcat(path, "/");
+			break;
+		case OF_DT_END_NODE:
+			ft_parentize(path, 1);
+			break;
+		}
+	return NULL;
+}
+
+int ft_get_prop(const void *bphp, const void *node, const char *propname,
+		void *buf, const unsigned int buflen)
+{
+	struct ft_entity fte;
+	u32 *p, size;
+	int depth;
+
+	depth = 0;
+	p = (u32 *)node;
+	while ((p = ft_next(p, bphp, &fte)) != NULL)
+		switch (be32_to_cpu(*fte.tagp)) {
+		case OF_DT_BEGIN_NODE:
+			depth++;
+			break;
+		case OF_DT_PROP:
+			if ((depth == 1) && !strcmp(fte.name, propname)) {
+				size = min(be32_to_cpu(*fte.sizep),(u32)buflen);
+				memcpy(buf, fte.datap, size);
+				return size;
+			}
+			break;
+		case OF_DT_END_NODE:
+			if (--depth <= 0)
+				return -1;
+			break;
+		}
+	return -1;
+}
+
+static void ft_modify_prop(void **bphpp, char *datap, u32 *old_prop_sizep,
+		const char *buf, const unsigned int buflen)
+{
+	u32 old_prop_data_len, new_prop_data_len;
+
+	old_prop_data_len = _ALIGN(be32_to_cpu(*old_prop_sizep), 4);
+	new_prop_data_len = _ALIGN(buflen, 4);
+
+	/* Check if new prop data fits in old prop data area */
+	if (new_prop_data_len == old_prop_data_len) {
+		memcpy(datap, buf, buflen);
+		*old_prop_sizep = cpu_to_be32(buflen);
+	} else {
+		/* Need to alloc new area to put larger or smaller ft */
+		struct boot_param_header *old_bph = *bphpp, *new_bph;
+		u32 *old_tailp, *new_tailp, *new_datap;
+		u32 old_total_size, new_total_size, head_len, tail_len, diff, v;
+
+		old_total_size = be32_to_cpu(old_bph->totalsize);
+		head_len = (u32)(datap - (char *)old_bph);
+		tail_len = old_total_size - (head_len + old_prop_data_len);
+		old_tailp = (u32 *)(datap + old_prop_data_len);
+		new_total_size = head_len + new_prop_data_len + tail_len;
+
+		if (!(new_bph = ft_malloc(new_total_size))) {
+			printf("Can't alloc space for new ft\n");
+			ft_exit(-ENOSPC);
+		}
+
+		new_datap = (u32 *)((char *)new_bph + head_len);
+		new_tailp = (u32 *)((char *)new_datap + new_prop_data_len);
+
+		memcpy(new_bph, *bphpp, head_len);
+		memcpy(new_datap, buf, buflen);
+		memcpy(new_tailp, old_tailp, tail_len);
+
+		*(new_datap - 2) = cpu_to_be32(buflen); /* Set prop size */
+
+		new_bph->totalsize = cpu_to_be32(new_total_size);
+		diff = new_prop_data_len - old_prop_data_len;
+
+		if (be32_to_cpu(old_bph->off_dt_strings)
+				> be32_to_cpu(old_bph->off_dt_struct)) {
+			v = be32_to_cpu(new_bph->off_dt_strings);
+			new_bph->off_dt_strings = cpu_to_be32(v + diff);
+		}
+
+		if (be32_to_cpu(old_bph->off_mem_rsvmap)
+				> be32_to_cpu(old_bph->off_dt_struct)) {
+			v = be32_to_cpu(new_bph->off_mem_rsvmap);
+			new_bph->off_mem_rsvmap = cpu_to_be32(v + diff);
+		}
+
+		ft_free(*bphpp, old_total_size);
+		*bphpp = new_bph;
+	}
+}
+
+/*
+ * - Only modifies existing properties.
+ * - The dev tree passed in may be freed and a new one allocated
+ *   (and *bphpp set to location of new dev tree).
+ */
+int ft_set_prop(void **bphpp, const void *node, const char *propname,
+		const void *buf, const unsigned int buflen)
+{
+	struct ft_entity fte;
+	u32 *p;
+	int depth;
+
+	depth = 0;
+	p = (u32 *)node;
+	while ((p = ft_next(p, *bphpp, &fte)) != NULL)
+		switch (be32_to_cpu(*fte.tagp)) {
+		case OF_DT_BEGIN_NODE:
+			depth++;
+			break;
+		case OF_DT_PROP:
+			if ((depth == 1) && !strcmp(fte.name, propname)) {
+				ft_modify_prop(bphpp, fte.datap, fte.sizep, buf,
+						buflen);
+				return be32_to_cpu(*fte.sizep);
+			}
+			break;
+		case OF_DT_END_NODE:
+			if (--depth <= 0)
+				return -1;
+			break;
+		}
+	return -1;
+}
diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h
new file mode 100644
index 0000000..0690dd5
--- /dev/null
+++ b/arch/powerpc/boot/flatdevtree.h
@@ -0,0 +1,106 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef _FLATDEVTREE_H_
+#define _FLATDEVTREE_H_
+
+#include "flatdevtree_env.h"
+
+/* Definitions used by the flattened device tree */
+#define OF_DT_HEADER            0xd00dfeed      /* marker */
+#define OF_DT_BEGIN_NODE        0x1     /* Start of node, full name */
+#define OF_DT_END_NODE          0x2     /* End node */
+#define OF_DT_PROP              0x3     /* Property: name off, size, content */
+#define OF_DT_NOP               0x4     /* nop */
+#define OF_DT_END               0x9
+
+#define OF_DT_VERSION           0x10
+
+struct boot_param_header {
+	u32 magic;              /* magic word OF_DT_HEADER */
+	u32 totalsize;          /* total size of DT block */
+	u32 off_dt_struct;      /* offset to structure */
+	u32 off_dt_strings;     /* offset to strings */
+	u32 off_mem_rsvmap;     /* offset to memory reserve map */
+	u32 version;            /* format version */
+	u32 last_comp_version;  /* last compatible version */
+	/* version 2 fields below */
+	u32 boot_cpuid_phys;    /* Physical CPU id we're booting on */
+	/* version 3 fields below */
+	u32 dt_strings_size;    /* size of the DT strings block */
+};
+
+struct ft_cxt {
+	struct boot_param_header *bph;
+	int max_size;           /* maximum size of tree */
+	int overflow;           /* set when this happens */
+	char *p, *pstr, *pres;  /* running pointers */
+	char *p_begin, *pstr_begin, *pres_begin;        /* starting pointers */
+	char *p_anchor;         /* start of constructed area */
+	int struct_size, strings_size, res_size;
+};
+
+void ft_begin_node(struct ft_cxt *cxt, const char *name);
+void ft_end_node(struct ft_cxt *cxt);
+
+void ft_begin_tree(struct ft_cxt *cxt);
+int ft_end_tree(struct ft_cxt *cxt);
+
+void ft_nop(struct ft_cxt *cxt);
+void ft_prop(struct ft_cxt *cxt, const char *name,
+             const void *data, unsigned int sz);
+void ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str);
+void ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val);
+void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size);
+void ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
+
+void ft_dump_blob(const void *bphp);
+void ft_merge_blob(struct ft_cxt *cxt, void *blob);
+
+void *ft_find_node(const void *bphp, const char *srch_path);
+int ft_get_prop(const void *bphp, const void *node, const char *propname,
+		void *buf, const unsigned int buflen);
+int ft_set_prop(void **bphp, const void *node, const char *propname,
+		const void *buf, const unsigned int buflen);
+
+static inline char *ft_strrchr(const char *s, int c)
+{
+	const char *p = s + strlen(s);
+
+	do {
+		if (*p == (char)c)
+			return (char *)p;
+	} while (--p >= s);
+	return NULL;
+}
+
+/* 'path' is modified */
+static inline void ft_parentize(char *path, int leave_slash)
+{
+	char *s = &path[strlen(path) - 1];
+
+	if (*s == '/')
+		*s = '\0';
+	s = ft_strrchr(path, '/');
+	if (s != NULL) {
+		if (leave_slash)
+			s[1] = '\0';
+		else if (s[0] == '/')
+			s[0] = '\0';
+	}
+}
+
+#endif /* FLATDEVTREE_H */

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Hollis Blanchard]

On Thu, 2006-09-07 at 20:46 -0700, Mark A. Greer wrote:
> --- /dev/null
> +++ b/arch/powerpc/boot/flatdevtree.c
> @@ -0,0 +1,628 @@
> +/*
> + * DO NOT EDIT THIS FILE!!
> + *
> + * The master copy is kept in a mercurial repository that you can clone:
> + *	"hg clone http://unsanctioned.org/flatdevtree/hgweb.py flatdevtree"
> + * Please send patches to Hollis Blanchard <hollisb@us.ibm.com> and
> + * CC: <Linuxppc-dev@ozlabs.org>
> + *

Actually I'm not intending for that to be a long-term URL. If we need
something permanent for this file, I can set something up on
penguinppc.org...

(NAK)

-Hollis

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Mark A. Greer]

On Fri, Sep 08, 2006 at 09:46:27AM -0500, Hollis Blanchard wrote:
> On Thu, 2006-09-07 at 20:46 -0700, Mark A. Greer wrote:
> > --- /dev/null
> > +++ b/arch/powerpc/boot/flatdevtree.c
> > @@ -0,0 +1,628 @@
> > +/*
> > + * DO NOT EDIT THIS FILE!!
> > + *
> > + * The master copy is kept in a mercurial repository that you can clone:
> > + *	"hg clone http://unsanctioned.org/flatdevtree/hgweb.py flatdevtree"
> > + * Please send patches to Hollis Blanchard <hollisb@us.ibm.com> and
> > + * CC: <Linuxppc-dev@ozlabs.org>
> > + *
> 
> Actually I'm not intending for that to be a long-term URL. If we need
> something permanent for this file, I can set something up on
> penguinppc.org...
> 
> (NAK)

Okay.  May as well wait for Paul's changes for doing much more anyway.

Mark

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Jon Loeliger]

On Fri, 2006-09-08 at 09:46, Hollis Blanchard wrote:
> On Thu, 2006-09-07 at 20:46 -0700, Mark A. Greer wrote:
> > --- /dev/null
> > +++ b/arch/powerpc/boot/flatdevtree.c
> > @@ -0,0 +1,628 @@
> > +/*
> > + * DO NOT EDIT THIS FILE!!
> > + *
> > + * The master copy is kept in a mercurial repository that you can clone:
> > + *	"hg clone http://unsanctioned.org/flatdevtree/hgweb.py flatdevtree"
> > + * Please send patches to Hollis Blanchard <hollisb@us.ibm.com> and
> > + * CC: <Linuxppc-dev@ozlabs.org>
> > + *
> 
> Actually I'm not intending for that to be a long-term URL. If we need
> something permanent for this file, I can set something up on
> penguinppc.org...
> 
> (NAK)
> 
> -Hollis

Wasn't there a notion of even combining this with
the DTC code base directly?  I haven't seen any
patches or motion down this line, though...?

Thanks,
jdl

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Jon Loeliger]

On Mon, 2006-09-11 at 13:44, Hollis Blanchard wrote:

> That's certainly a good place the new code could be applied. Of course,
> I haven't sent patches to uboot, iseries boot code, kexec, or any other
> number of places either, and don't really plan to. If those areas have
> problems, they can switch to the consolidated codebase then (rather than
> bugfixing the non-consolidated code).

I'm worried about the code-duplication factor here...

> Why, are you going to convert DTC?

I'm not opposed to accepting patches. :-)

jdl

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Hollis Blanchard]

On Mon, 2006-09-11 at 12:27 -0500, Jon Loeliger wrote:
> 
> Wasn't there a notion of even combining this with
> the DTC code base directly?  I haven't seen any
> patches or motion down this line, though...?

That's certainly a good place the new code could be applied. Of course,
I haven't sent patches to uboot, iseries boot code, kexec, or any other
number of places either, and don't really plan to. If those areas have
problems, they can switch to the consolidated codebase then (rather than
bugfixing the non-consolidated code).

Why, are you going to convert DTC?

-Hollis

Re: [PATCH 1/1] bootwrapper: add flat device tree support code

[Hollis Blanchard]

On Mon, 2006-09-11 at 13:39 -0500, Jon Loeliger wrote:
> On Mon, 2006-09-11 at 13:44, Hollis Blanchard wrote:
> 
> > That's certainly a good place the new code could be applied. Of course,
> > I haven't sent patches to uboot, iseries boot code, kexec, or any other
> > number of places either, and don't really plan to. If those areas have
> > problems, they can switch to the consolidated codebase then (rather than
> > bugfixing the non-consolidated code).
> 
> I'm worried about the code-duplication factor here...

The functionality has already been duplicated, and more was on the way.
The consolidated code prevents that from spreading, but by itself
doesn't replace any of the existing duplication.

> > Why, are you going to convert DTC?
> 
> I'm not opposed to accepting patches. :-)

Have fun.

-Hollis