Merge tag 'nfs-for-4.11-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[mirror_ubuntu-bionic-kernel.git] / scripts / dtc / flattree.c

diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index ec14954f5810de3ad7262d5ee60e21b23565c155..ebac548b3fa81a1658b0d60dcb369c2c50f1cab0 100644 (file)
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -366,7 +366,7 @@ static void make_fdt_header(struct fdt_header *fdt,
                fdt->size_dt_struct = cpu_to_fdt32(dtsize);
 }
 
-void dt_to_blob(FILE *f, struct boot_info *bi, int version)
+void dt_to_blob(FILE *f, struct dt_info *dti, int version)
 {
        struct version_info *vi = NULL;
        int i;
@@ -384,29 +384,36 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version)
        if (!vi)
                die("Unknown device tree blob version %d\n", version);
 
-       flatten_tree(bi->dt, &bin_emitter, &dtbuf, &strbuf, vi);
+       flatten_tree(dti->dt, &bin_emitter, &dtbuf, &strbuf, vi);
        bin_emit_cell(&dtbuf, FDT_END);
 
-       reservebuf = flatten_reserve_list(bi->reservelist, vi);
+       reservebuf = flatten_reserve_list(dti->reservelist, vi);
 
        /* Make header */
        make_fdt_header(&fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,
-                       bi->boot_cpuid_phys);
+                       dti->boot_cpuid_phys);
 
        /*
         * If the user asked for more space than is used, adjust the totalsize.
         */
        if (minsize > 0) {
                padlen = minsize - fdt32_to_cpu(fdt.totalsize);
-               if ((padlen < 0) && (quiet < 1))
-                       fprintf(stderr,
-                               "Warning: blob size %d >= minimum size %d\n",
-                               fdt32_to_cpu(fdt.totalsize), minsize);
+               if (padlen < 0) {
+                       padlen = 0;
+                       if (quiet < 1)
+                               fprintf(stderr,
+                                       "Warning: blob size %d >= minimum size %d\n",
+                                       fdt32_to_cpu(fdt.totalsize), minsize);
+               }
        }
 
        if (padsize > 0)
                padlen = padsize;
 
+       if (alignsize > 0)
+               padlen = ALIGN(fdt32_to_cpu(fdt.totalsize) + padlen, alignsize)
+                       - fdt32_to_cpu(fdt.totalsize);
+
        if (padlen > 0) {
                int tsize = fdt32_to_cpu(fdt.totalsize);
                tsize += padlen;
@@ -460,7 +467,7 @@ static void dump_stringtable_asm(FILE *f, struct data strbuf)
        }
 }
 
-void dt_to_asm(FILE *f, struct boot_info *bi, int version)
+void dt_to_asm(FILE *f, struct dt_info *dti, int version)
 {
        struct version_info *vi = NULL;
        int i;
@@ -500,7 +507,7 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version)
 
        if (vi->flags & FTF_BOOTCPUID) {
                fprintf(f, "\t/* boot_cpuid_phys */\n");
-               asm_emit_cell(f, bi->boot_cpuid_phys);
+               asm_emit_cell(f, dti->boot_cpuid_phys);
        }
 
        if (vi->flags & FTF_STRTABSIZE) {
@@ -530,7 +537,7 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version)
         * Use .long on high and low halfs of u64s to avoid .quad
         * as it appears .quad isn't available in some assemblers.
         */
-       for (re = bi->reservelist; re; re = re->next) {
+       for (re = dti->reservelist; re; re = re->next) {
                struct label *l;
 
                for_each_label(re->labels, l) {
@@ -550,7 +557,7 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version)
        fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
 
        emit_label(f, symprefix, "struct_start");
-       flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi);
+       flatten_tree(dti->dt, &asm_emitter, f, &strbuf, vi);
 
        fprintf(f, "\t/* FDT_END */\n");
        asm_emit_cell(f, FDT_END);
@@ -572,6 +579,8 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version)
        if (padsize > 0) {
                fprintf(f, "\t.space\t%d, 0\n", padsize);
        }
+       if (alignsize > 0)
+               asm_emit_align(f, alignsize);
        emit_label(f, symprefix, "blob_abs_end");
 
        data_free(strbuf);
@@ -797,11 +806,15 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
                }
        } while (val != FDT_END_NODE);
 
+       if (node->name != flatname) {
+               free(flatname);
+       }
+
        return node;
 }
 
 
-struct boot_info *dt_from_blob(const char *fname)
+struct dt_info *dt_from_blob(const char *fname)
 {
        FILE *f;
        uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys;
@@ -929,5 +942,5 @@ struct boot_info *dt_from_blob(const char *fname)
 
        fclose(f);
 
-       return build_boot_info(reservelist, tree, boot_cpuid_phys);
+       return build_dt_info(DTSF_V1, reservelist, tree, boot_cpuid_phys);
 }