1 files changed, 108 insertions, 92 deletions

diff --git a/arch/powerpc/boot/libfdt/fdt_rw.c b/arch/powerpc/boot/libfdt/fdt_rw.c
index 6673f8ec962a..8e7ec4cb7bcd 100644
--- a/arch/powerpc/boot/libfdt/fdt_rw.c
+++ b/arch/powerpc/boot/libfdt/fdt_rw.c
@@ -55,10 +55,10 @@
 
 #include "libfdt_internal.h"
 
-static int _blocks_misordered(const void *fdt,
+static int _fdt_blocks_misordered(const void *fdt,
                               int mem_rsv_size, int struct_size)
 {
-        return (fdt_off_mem_rsvmap(fdt) < ALIGN(sizeof(struct fdt_header), 8))
+        return (fdt_off_mem_rsvmap(fdt) < FDT_ALIGN(sizeof(struct fdt_header), 8))
                 || (fdt_off_dt_struct(fdt) <
                     (fdt_off_mem_rsvmap(fdt) + mem_rsv_size))
                 || (fdt_off_dt_strings(fdt) <
@@ -67,16 +67,14 @@ static int _blocks_misordered(const void *fdt,
                     (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
 }
 
-static int rw_check_header(void *fdt)
+static int _fdt_rw_check_header(void *fdt)
 {
-        int err;
+        FDT_CHECK_HEADER(fdt);
 
-        if ((err = fdt_check_header(fdt)))
-                return err;
         if (fdt_version(fdt) < 17)
                 return -FDT_ERR_BADVERSION;
-        if (_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),
-                               fdt_size_dt_struct(fdt)))
+        if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),
+                                   fdt_size_dt_struct(fdt)))
                 return -FDT_ERR_BADLAYOUT;
         if (fdt_version(fdt) > 17)
                 fdt_set_version(fdt, 17);
@@ -84,36 +82,37 @@ static int rw_check_header(void *fdt)
         return 0;
 }
 
-#define RW_CHECK_HEADER(fdt) \
+#define FDT_RW_CHECK_HEADER(fdt) \
         { \
                 int err; \
-                if ((err = rw_check_header(fdt)) != 0) \
+                if ((err = _fdt_rw_check_header(fdt)) != 0) \
                         return err; \
         }
 
-static inline int _blob_data_size(void *fdt)
+static inline int _fdt_data_size(void *fdt)
 {
         return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
 }
 
-static int _blob_splice(void *fdt, void *p, int oldlen, int newlen)
+static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)
 {
-        void *end = fdt + _blob_data_size(fdt);
+        char *p = splicepoint;
+        char *end = (char *)fdt + _fdt_data_size(fdt);
 
         if (((p + oldlen) < p) || ((p + oldlen) > end))
                 return -FDT_ERR_BADOFFSET;
-        if ((end - oldlen + newlen) > (fdt + fdt_totalsize(fdt)))
+        if ((end - oldlen + newlen) > ((char *)fdt + fdt_totalsize(fdt)))
                 return -FDT_ERR_NOSPACE;
         memmove(p + newlen, p + oldlen, end - p - oldlen);
         return 0;
 }
 
-static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
-                                int oldn, int newn)
+static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
+                               int oldn, int newn)
 {
         int delta = (newn - oldn) * sizeof(*p);
         int err;
-        err = _blob_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));
+        err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));
         if (err)
                 return err;
         fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta);
@@ -121,13 +120,13 @@ static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
         return 0;
 }
 
-static int _blob_splice_struct(void *fdt, void *p,
-                               int oldlen, int newlen)
+static int _fdt_splice_struct(void *fdt, void *p,
+                              int oldlen, int newlen)
 {
         int delta = newlen - oldlen;
         int err;
 
-        if ((err = _blob_splice(fdt, p, oldlen, newlen)))
+        if ((err = _fdt_splice(fdt, p, oldlen, newlen)))
                 return err;
 
         fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);
@@ -135,19 +134,20 @@ static int _blob_splice_struct(void *fdt, void *p,
         return 0;
 }
 
-static int _blob_splice_string(void *fdt, int newlen)
+static int _fdt_splice_string(void *fdt, int newlen)
 {
-        void *p = fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
+        void *p = (char *)fdt
+                + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
         int err;
 
-        if ((err = _blob_splice(fdt, p, 0, newlen)))
+        if ((err = _fdt_splice(fdt, p, 0, newlen)))
                 return err;
 
         fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);
         return 0;
 }
 
-static int _find_add_string(void *fdt, const char *s)
+static int _fdt_find_add_string(void *fdt, const char *s)
 {
         char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);
         const char *p;
@@ -161,7 +161,7 @@ static int _find_add_string(void *fdt, const char *s)
                 return (p - strtab);
 
         new = strtab + fdt_size_dt_strings(fdt);
-        err = _blob_splice_string(fdt, len);
+        err = _fdt_splice_string(fdt, len);
         if (err)
                 return err;
 
@@ -174,11 +174,10 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
         struct fdt_reserve_entry *re;
         int err;
 
-        if ((err = rw_check_header(fdt)))
-                return err;
+        FDT_RW_CHECK_HEADER(fdt);
 
         re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));
-        err = _blob_splice_mem_rsv(fdt, re, 0, 1);
+        err = _fdt_splice_mem_rsv(fdt, re, 0, 1);
         if (err)
                 return err;
 
@@ -192,19 +191,19 @@ int fdt_del_mem_rsv(void *fdt, int n)
         struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);
         int err;
 
-        if ((err = rw_check_header(fdt)))
-                return err;
+        FDT_RW_CHECK_HEADER(fdt);
+
         if (n >= fdt_num_mem_rsv(fdt))
                 return -FDT_ERR_NOTFOUND;
 
-        err = _blob_splice_mem_rsv(fdt, re, 1, 0);
+        err = _fdt_splice_mem_rsv(fdt, re, 1, 0);
         if (err)
                 return err;
         return 0;
 }
 
-static int _resize_property(void *fdt, int nodeoffset, const char *name, int len,
-                            struct fdt_property **prop)
+static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
+                                int len, struct fdt_property **prop)
 {
         int oldlen;
         int err;
@@ -213,36 +212,33 @@ static int _resize_property(void *fdt, int nodeoffset, const char *name, int len
         if (! (*prop))
                 return oldlen;
 
-        if ((err = _blob_splice_struct(fdt, (*prop)->data,
-                                       ALIGN(oldlen, FDT_TAGSIZE),
-                                       ALIGN(len, FDT_TAGSIZE))))
+        if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),
+                                      FDT_TAGALIGN(len))))
                 return err;
 
         (*prop)->len = cpu_to_fdt32(len);
         return 0;
 }
 
-static int _add_property(void *fdt, int nodeoffset, const char *name, int len,
-                         struct fdt_property **prop)
+static int _fdt_add_property(void *fdt, int nodeoffset, const char *name,
+                             int len, struct fdt_property **prop)
 {
-        uint32_t tag;
         int proplen;
         int nextoffset;
         int namestroff;
         int err;
 
-        tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
-        if (tag != FDT_BEGIN_NODE)
-                return -FDT_ERR_BADOFFSET;
+        if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)
+                return nextoffset;
 
-        namestroff = _find_add_string(fdt, name);
+        namestroff = _fdt_find_add_string(fdt, name);
         if (namestroff < 0)
                 return namestroff;
 
         *prop = _fdt_offset_ptr_w(fdt, nextoffset);
-        proplen = sizeof(**prop) + ALIGN(len, FDT_TAGSIZE);
+        proplen = sizeof(**prop) + FDT_TAGALIGN(len);
 
-        err = _blob_splice_struct(fdt, *prop, 0, proplen);
+        err = _fdt_splice_struct(fdt, *prop, 0, proplen);
         if (err)
                 return err;
 
@@ -252,18 +248,40 @@ static int _add_property(void *fdt, int nodeoffset, const char *name, int len,
         return 0;
 }
 
+int fdt_set_name(void *fdt, int nodeoffset, const char *name)
+{
+        char *namep;
+        int oldlen, newlen;
+        int err;
+
+        FDT_RW_CHECK_HEADER(fdt);
+
+        namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
+        if (!namep)
+                return oldlen;
+
+        newlen = strlen(name);
+
+        err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1),
+                                 FDT_TAGALIGN(newlen+1));
+        if (err)
+                return err;
+
+        memcpy(namep, name, newlen+1);
+        return 0;
+}
+
 int fdt_setprop(void *fdt, int nodeoffset, const char *name,
                 const void *val, int len)
 {
         struct fdt_property *prop;
         int err;
 
-        if ((err = rw_check_header(fdt)))
-                return err;
+        FDT_RW_CHECK_HEADER(fdt);
 
-        err = _resize_property(fdt, nodeoffset, name, len, &prop);
+        err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop);
         if (err == -FDT_ERR_NOTFOUND)
-                err = _add_property(fdt, nodeoffset, name, len, &prop);
+                err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
         if (err)
                 return err;
 
@@ -276,14 +294,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)
         struct fdt_property *prop;
         int len, proplen;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_RW_CHECK_HEADER(fdt);
 
         prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
         if (! prop)
                 return len;
 
-        proplen = sizeof(*prop) + ALIGN(len, FDT_TAGSIZE);
-        return _blob_splice_struct(fdt, prop, proplen, 0);
+        proplen = sizeof(*prop) + FDT_TAGALIGN(len);
+        return _fdt_splice_struct(fdt, prop, proplen, 0);
 }
 
 int fdt_add_subnode_namelen(void *fdt, int parentoffset,
@@ -296,7 +314,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         uint32_t tag;
         uint32_t *endtag;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_RW_CHECK_HEADER(fdt);
 
         offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);
         if (offset >= 0)
@@ -309,19 +327,19 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         do {
                 offset = nextoffset;
                 tag = fdt_next_tag(fdt, offset, &nextoffset);
-        } while (tag == FDT_PROP);
+        } while ((tag == FDT_PROP) || (tag == FDT_NOP));
 
         nh = _fdt_offset_ptr_w(fdt, offset);
-        nodelen = sizeof(*nh) + ALIGN(namelen+1, FDT_TAGSIZE) + FDT_TAGSIZE;
+        nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE;
 
-        err = _blob_splice_struct(fdt, nh, 0, nodelen);
+        err = _fdt_splice_struct(fdt, nh, 0, nodelen);
         if (err)
                 return err;
 
         nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);
-        memset(nh->name, 0, ALIGN(namelen+1, FDT_TAGSIZE));
+        memset(nh->name, 0, FDT_TAGALIGN(namelen+1));
         memcpy(nh->name, name, namelen);
-        endtag = (uint32_t *)((void *)nh + nodelen - FDT_TAGSIZE);
+        endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE);
         *endtag = cpu_to_fdt32(FDT_END_NODE);
 
         return offset;
@@ -336,36 +354,36 @@ int fdt_del_node(void *fdt, int nodeoffset)
 {
         int endoffset;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_RW_CHECK_HEADER(fdt);
 
         endoffset = _fdt_node_end_offset(fdt, nodeoffset);
         if (endoffset < 0)
                 return endoffset;
 
-        return _blob_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),
-                                   endoffset - nodeoffset, 0);
+        return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),
+                                  endoffset - nodeoffset, 0);
 }
 
-static void _packblocks(const void *fdt, void *buf,
-                       int mem_rsv_size, int struct_size)
+static void _fdt_packblocks(const char *old, char *new,
+                            int mem_rsv_size, int struct_size)
 {
         int mem_rsv_off, struct_off, strings_off;
 
-        mem_rsv_off = ALIGN(sizeof(struct fdt_header), 8);
+        mem_rsv_off = FDT_ALIGN(sizeof(struct fdt_header), 8);
         struct_off = mem_rsv_off + mem_rsv_size;
         strings_off = struct_off + struct_size;
 
-        memmove(buf + mem_rsv_off, fdt + fdt_off_mem_rsvmap(fdt), mem_rsv_size);
-        fdt_set_off_mem_rsvmap(buf, mem_rsv_off);
+        memmove(new + mem_rsv_off, old + fdt_off_mem_rsvmap(old), mem_rsv_size);
+        fdt_set_off_mem_rsvmap(new, mem_rsv_off);
 
-        memmove(buf + struct_off, fdt + fdt_off_dt_struct(fdt), struct_size);
-        fdt_set_off_dt_struct(buf, struct_off);
-        fdt_set_size_dt_struct(buf, struct_size);
+        memmove(new + struct_off, old + fdt_off_dt_struct(old), struct_size);
+        fdt_set_off_dt_struct(new, struct_off);
+        fdt_set_size_dt_struct(new, struct_size);
 
-        memmove(buf + strings_off, fdt + fdt_off_dt_strings(fdt),
-                fdt_size_dt_strings(fdt));
-        fdt_set_off_dt_strings(buf, strings_off);
-        fdt_set_size_dt_strings(buf, fdt_size_dt_strings(fdt));
+        memmove(new + strings_off, old + fdt_off_dt_strings(old),
+                fdt_size_dt_strings(old));
+        fdt_set_off_dt_strings(new, strings_off);
+        fdt_set_size_dt_strings(new, fdt_size_dt_strings(old));
 }
 
 int fdt_open_into(const void *fdt, void *buf, int bufsize)
@@ -373,11 +391,11 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
         int err;
         int mem_rsv_size, struct_size;
         int newsize;
-        void *tmp;
+        const char *fdtstart = fdt;
+        const char *fdtend = fdtstart + fdt_totalsize(fdt);
+        char *tmp;
 
-        err = fdt_check_header(fdt);
-        if (err)
-                return err;
+        FDT_CHECK_HEADER(fdt);
 
         mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                 * sizeof(struct fdt_reserve_entry);
@@ -390,7 +408,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
                         ;
         }
 
-        if (!_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
+        if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
                 /* no further work necessary */
                 err = fdt_move(fdt, buf, bufsize);
                 if (err)
@@ -402,22 +420,23 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
         }
 
         /* Need to reorder */
-        newsize = ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size
+        newsize = FDT_ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size
                 + struct_size + fdt_size_dt_strings(fdt);
 
         if (bufsize < newsize)
                 return -FDT_ERR_NOSPACE;
 
-        if (((buf + newsize) <= fdt)
-            || (buf >= (fdt + fdt_totalsize(fdt)))) {
-                tmp = buf;
-        } else {
-                tmp = (void *)fdt + fdt_totalsize(fdt);
-                if ((tmp + newsize) > (buf + bufsize))
+        /* First attempt to build converted tree at beginning of buffer */
+        tmp = buf;
+        /* But if that overlaps with the old tree... */
+        if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {
+                /* Try right after the old tree instead */
+                tmp = (char *)(uintptr_t)fdtend;
+                if ((tmp + newsize) > ((char *)buf + bufsize))
                         return -FDT_ERR_NOSPACE;
         }
 
-        _packblocks(fdt, tmp, mem_rsv_size, struct_size);
+        _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size);
         memmove(buf, tmp, newsize);
 
         fdt_set_magic(buf, FDT_MAGIC);
@@ -432,16 +451,13 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 int fdt_pack(void *fdt)
 {
         int mem_rsv_size;
-        int err;
 
-        err = rw_check_header(fdt);
-        if (err)
-                return err;
+        FDT_RW_CHECK_HEADER(fdt);
 
         mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                 * sizeof(struct fdt_reserve_entry);
-        _packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
-        fdt_set_totalsize(fdt, _blob_data_size(fdt));
+        _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
+        fdt_set_totalsize(fdt, _fdt_data_size(fdt));
 
         return 0;
 }