[POWERPC] Use embedded libfdt in the bootwrapper

This incorporates libfdt (from the source embedded in an earlier
commit) into the wrapper.a library used by the bootwrapper.  This
includes adding a libfdt_env.h file, which the libfdt sources need in
order to integrate into the bootwrapper environment, and a
libfdt-wrapper.c which provides glue to connect the bootwrapper's
abstract device tree callbacks to the libfdt functions.

In addition, this changes the various wrapper and platform files to
use libfdt functions instead of the older flatdevtree.c library.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

18 files changed, 219 insertions, 16 deletions

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index e1c73e9afa59..2d2c9843ce93 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -33,7 +33,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y)
 BOOTCFLAGS      += -fno-stack-protector
 endif
 
-BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt
 
 $(obj)/4xx.o: BOOTCFLAGS += -mcpu=440
 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
@@ -46,7 +46,9 @@ zliblinuxheader := zlib.h zconf.h zutil.h
 $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
         $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
 
+src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
+                $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \
                 ns16550.c serial.c simple_alloc.c div64.S util.S \
                 gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
                 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
@@ -101,8 +103,10 @@ quiet_cmd_bootar = BOOTAR  $@
       cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
 
 $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE
+        $(Q)mkdir -p $(dir $@)
         $(call if_changed_dep,bootcc)
 $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S FORCE
+        $(Q)mkdir -p $(dir $@)
         $(call if_changed_dep,bootas)
 
 $(obj)/wrapper.a: $(obj-wlib) FORCE
diff --git a/arch/powerpc/boot/bamboo.c b/arch/powerpc/boot/bamboo.c
index f61fcdab1c7c..e634359d98e9 100644
--- a/arch/powerpc/boot/bamboo.c
+++ b/arch/powerpc/boot/bamboo.c
@@ -42,6 +42,6 @@ void bamboo_init(void *mac0, void *mac1)
         platform_ops.exit = ibm44x_dbcr_reset;
         bamboo_mac0 = mac0;
         bamboo_mac1 = mac1;
-        ft_init(_dtb_start, 0, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/cuboot-52xx.c b/arch/powerpc/boot/cuboot-52xx.c
index 9256a26d40e4..a8611546a656 100644
--- a/arch/powerpc/boot/cuboot-52xx.c
+++ b/arch/powerpc/boot/cuboot-52xx.c
@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index a0505509abcc..acd860ed7393 100644
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -52,7 +52,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index 345dcbecef0f..943779ed19be 100644
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-8xx.c b/arch/powerpc/boot/cuboot-8xx.c
index 0e82015a5f95..c202c8868bd6 100644
--- a/arch/powerpc/boot/cuboot-8xx.c
+++ b/arch/powerpc/boot/cuboot-8xx.c
@@ -41,7 +41,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-hpc2.c b/arch/powerpc/boot/cuboot-hpc2.c
index d333898bca30..1b8953259d75 100644
--- a/arch/powerpc/boot/cuboot-hpc2.c
+++ b/arch/powerpc/boot/cuboot-hpc2.c
@@ -42,7 +42,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index 61574f3272dd..f56ac6cae9f3 100644
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -255,7 +255,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = pq2_platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
index ec635e0bd4ec..cf78260fcf3f 100644
--- a/arch/powerpc/boot/cuboot-sequoia.c
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -51,6 +51,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         CUBOOT_INIT();
         platform_ops.fixups = sequoia_fixups;
         platform_ops.exit = ibm44x_dbcr_reset;
-        ft_init(_dtb_start, 0, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index 86c0f5df0a86..ee31be5e633e 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -146,6 +146,6 @@ void ebony_init(void *mac0, void *mac1)
         platform_ops.exit = ibm44x_dbcr_reset;
         ebony_mac0 = mac0;
         ebony_mac1 = mac1;
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/ep88xc.c b/arch/powerpc/boot/ep88xc.c
index 6b87cdce3fe7..a400f5407155 100644
--- a/arch/powerpc/boot/ep88xc.c
+++ b/arch/powerpc/boot/ep88xc.c
@@ -45,7 +45,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         mem_size *= 1024 * 1024;
         simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
 
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
 
         planetcore_set_stdout_path(table);
 
diff --git a/arch/powerpc/boot/holly.c b/arch/powerpc/boot/holly.c
index 199e783aea4d..58013b923178 100644
--- a/arch/powerpc/boot/holly.c
+++ b/arch/powerpc/boot/holly.c
@@ -28,6 +28,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5)
         u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
 
         simple_alloc_init(_end, heapsize, 32, 64);
-        ft_init(_dtb_start, 0, 4);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c
new file mode 100644
index 000000000000..002da16c97c1
--- /dev/null
+++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -0,0 +1,182 @@
+/*
+ * This file does the necessary interface mapping between the bootwrapper
+ * device tree operations and the interface provided by shared source
+ * files flatdevicetree.[ch].
+ *
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *
+ * This library 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 library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <page.h>
+#include <libfdt.h>
+#include "ops.h"
+
+#define DEBUG   0
+#define BAD_ERROR(err)  (((err) < 0) \
+                         && ((err) != -FDT_ERR_NOTFOUND) \
+                         && ((err) != -FDT_ERR_EXISTS))
+
+#define check_err(err) \
+        ({ \
+                if (BAD_ERROR(err) || ((err < 0) && DEBUG)) \
+                        printf("%s():%d  %s\n\r", __FUNCTION__, __LINE__, \
+                               fdt_strerror(err)); \
+                if (BAD_ERROR(err)) \
+                        exit(); \
+                (err < 0) ? -1 : 0; \
+        })
+
+#define offset_devp(off)        \
+        ({ \
+                int offset = (off); \
+                check_err(offset) ? NULL : (void *)(offset+1); \
+        })
+
+#define devp_offset(devp)       (((int)(devp))-1)
+
+static void *fdt;
+static void *buf; /* = NULL */
+
+#define EXPAND_GRANULARITY      1024
+
+static void expand_buf(int minexpand)
+{
+        int size = fdt_totalsize(fdt);
+        int rc;
+
+        size = _ALIGN(size + minexpand, EXPAND_GRANULARITY);
+        buf = platform_ops.realloc(buf, size);
+        if (!buf)
+                fatal("Couldn't find %d bytes to expand device tree\n\r", size);
+        rc = fdt_open_into(fdt, buf, size);
+        if (rc != 0)
+                fatal("Couldn't expand fdt into new buffer: %s\n\r",
+                      fdt_strerror(rc));
+
+        fdt = buf;
+}
+
+static void *fdt_wrapper_finddevice(const char *path)
+{
+        return offset_devp(fdt_path_offset(fdt, path));
+}
+
+static int fdt_wrapper_getprop(const void *devp, const char *name,
+                               void *buf, const int buflen)
+{
+        const void *p;
+        int len;
+
+        p = fdt_getprop(fdt, devp_offset(devp), name, &len);
+        if (!p)
+                return check_err(len);
+        memcpy(buf, p, min(len, buflen));
+        return len;
+}
+
+static int fdt_wrapper_setprop(const void *devp, const char *name,
+                               const void *buf, const int len)
+{
+        int rc;
+
+        rc = fdt_setprop(fdt, devp_offset(devp), name, buf, len);
+        if (rc == -FDT_ERR_NOSPACE) {
+                expand_buf(len + 16);
+                rc = fdt_setprop(fdt, devp_offset(devp), name, buf, len);
+        }
+
+        return check_err(rc);
+}
+
+static void *fdt_wrapper_get_parent(const void *devp)
+{
+        return offset_devp(fdt_parent_offset(fdt, devp_offset(devp)));
+}
+
+static void *fdt_wrapper_create_node(const void *devp, const char *name)
+{
+        int offset;
+
+        offset = fdt_add_subnode(fdt, devp_offset(devp), name);
+        if (offset == -FDT_ERR_NOSPACE) {
+                expand_buf(strlen(name) + 16);
+                offset = fdt_add_subnode(fdt, devp_offset(devp), name);
+        }
+
+        return offset_devp(offset);
+}
+
+static void *fdt_wrapper_find_node_by_prop_value(const void *prev,
+                                                 const char *name,
+                                                 const char *val,
+                                                 int len)
+{
+        return offset_devp(fdt_node_offset_by_prop_value(fdt, devp_offset(prev),
+                                                         name, val, len));
+}
+
+static char *fdt_wrapper_get_path(const void *devp, char *buf, int len)
+{
+        int rc;
+
+        rc = fdt_get_path(fdt, devp_offset(devp), buf, len);
+        if (check_err(rc))
+                return NULL;
+        return buf;
+}
+
+static unsigned long fdt_wrapper_finalize(void)
+{
+        int rc;
+
+        rc = fdt_pack(fdt);
+        if (rc != 0)
+                fatal("Couldn't pack flat tree: %s\n\r",
+                      fdt_strerror(rc));
+        return (unsigned long)fdt;
+}
+
+void fdt_init(void *blob)
+{
+        int err;
+
+        dt_ops.finddevice = fdt_wrapper_finddevice;
+        dt_ops.getprop = fdt_wrapper_getprop;
+        dt_ops.setprop = fdt_wrapper_setprop;
+        dt_ops.get_parent = fdt_wrapper_get_parent;
+        dt_ops.create_node = fdt_wrapper_create_node;
+        dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value;
+        dt_ops.get_path = fdt_wrapper_get_path;
+        dt_ops.finalize = fdt_wrapper_finalize;
+
+        /* Make sure the dt blob is the right version and so forth */
+        fdt = blob;
+        err = fdt_open_into(fdt, fdt, fdt_totalsize(blob));
+        if (err == -FDT_ERR_NOSPACE) {
+                int bufsize = fdt_totalsize(fdt) + 4;
+                buf = malloc(bufsize);
+                err = fdt_open_into(fdt, buf, bufsize);
+        }
+
+        if (err != 0)
+                fatal("fdt_init(): %s\n\r", fdt_strerror(err));
+
+        if (buf)
+                fdt = buf;
+}
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
new file mode 100644
index 000000000000..a4b0fc959ece
--- /dev/null
+++ b/arch/powerpc/boot/libfdt_env.h
@@ -0,0 +1,17 @@
+#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
+#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
+
+#include <types.h>
+#include <string.h>
+
+typedef u32 uint32_t;
+typedef u64 uint64_t;
+
+#define fdt16_to_cpu(x)         (x)
+#define cpu_to_fdt16(x)         (x)
+#define fdt32_to_cpu(x)         (x)
+#define cpu_to_fdt32(x)         (x)
+#define fdt64_to_cpu(x)         (x)
+#define cpu_to_fdt64(x)         (x)
+
+#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index a180b6505f47..28df2c5a9761 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -80,6 +80,7 @@ extern struct loader_info loader_info;
 
 void start(void);
 int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
+void fdt_init(void *blob);
 int serial_console_init(void);
 int ns16550_console_init(void *devp, struct serial_console_data *scdp);
 int mpsc_console_init(void *devp, struct serial_console_data *scdp);
diff --git a/arch/powerpc/boot/prpmc2800.c b/arch/powerpc/boot/prpmc2800.c
index 9614e1db9dae..05c3245b30d7 100644
--- a/arch/powerpc/boot/prpmc2800.c
+++ b/arch/powerpc/boot/prpmc2800.c
@@ -547,8 +547,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         if (!dtb)
                 exit();
         memmove(dtb, _dtb_start, dt_size);
-        if (ft_init(dtb, dt_size, 16))
-                exit();
+        fdt_init(dtb);
 
         bridge_base = mv64x60_get_bridge_base();
 
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
index d6661151b494..3b0ac4d006ec 100644
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
@@ -131,7 +131,7 @@ void platform_init(void)
         printf("\n-- PS3 bootwrapper --\n");
 
         simple_alloc_init(_end, heapsize, 32, 64);
-        ft_init(_dtb_start, 0, 4);
+        fdt_init(_dtb_start);
 
         chosen = finddevice("/chosen");
 
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
index bb2c309d70fc..70ffce343c0a 100644
--- a/arch/powerpc/boot/treeboot-walnut.c
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -128,6 +128,6 @@ void platform_init(void)
         simple_alloc_init(_end, avail_ram, 32, 32);
         platform_ops.fixups = walnut_fixups;
         platform_ops.exit = ibm40x_dbcr_reset;
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }