fdtdec: test: Add carveout tests

Implement carveout tests for 32-bit and 64-bit builds.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c
index 928950918413912844718000c6ee10ce7d2c378e..f6defe16c5a694a9af4e5e476aa550edf4ab6225 100644 (file)
--- a/lib/fdtdec_test.c
+++ b/lib/fdtdec_test.c
@@ -141,6 +141,156 @@ static int run_test(const char *aliases, const char *nodes, const char *expect)
        return 0;
 }
 
+static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns)
+{
+       const char *basename = "/display";
+       struct fdt_memory carveout = {
+#ifdef CONFIG_PHYS_64BIT
+               .start = 0x180000000,
+               .end = 0x18fffffff,
+#else
+               .start = 0x80000000,
+               .end = 0x8fffffff,
+#endif
+       };
+       fdt32_t cells[4], *ptr = cells;
+       uint32_t upper, lower;
+       char name[32];
+       int offset;
+
+       /* store one or two address cells */
+       lower = fdt_addr_unpack(carveout.start, &upper);
+
+       if (na > 1 && upper > 0)
+               snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,
+                        lower);
+       else
+               snprintf(name, sizeof(name), "%s@%x", basename, lower);
+
+       if (na > 1)
+               *ptr++ = cpu_to_fdt32(upper);
+
+       *ptr++ = cpu_to_fdt32(lower);
+
+       /* store one or two size cells */
+       lower = fdt_size_unpack(carveout.end - carveout.start + 1, &upper);
+
+       if (ns > 1)
+               *ptr++ = cpu_to_fdt32(upper);
+
+       *ptr++ = cpu_to_fdt32(lower);
+
+       offset = CHECK(fdt_add_subnode(fdt, 0, name + 1));
+       CHECK(fdt_setprop(fdt, offset, "reg", cells, (na + ns) * sizeof(*cells)));
+
+       return fdtdec_set_carveout(fdt, name, "memory-region", 0,
+                                  "framebuffer", &carveout);
+}
+
+static int check_fdt_carveout(void *fdt, uint32_t address_cells,
+                             uint32_t size_cells)
+{
+#ifdef CONFIG_PHYS_64BIT
+       const char *name = "/display@1,80000000";
+       const struct fdt_memory expected = {
+               .start = 0x180000000,
+               .end = 0x18fffffff,
+       };
+#else
+       const char *name = "/display@80000000";
+       const struct fdt_memory expected = {
+               .start = 0x80000000,
+               .end = 0x8fffffff,
+       };
+#endif
+       struct fdt_memory carveout;
+
+       printf("carveout: %pap-%pap na=%u ns=%u: ", &expected.start,
+              &expected.end, address_cells, size_cells);
+
+       CHECK(fdtdec_get_carveout(fdt, name, "memory-region", 0, &carveout));
+
+       if ((carveout.start != expected.start) ||
+           (carveout.end != expected.end)) {
+               printf("carveout: %pap-%pap, expected %pap-%pap\n",
+                      &carveout.start, &carveout.end,
+                      &expected.start, &expected.end);
+               return 1;
+       }
+
+       printf("pass\n");
+       return 0;
+}
+
+static int make_fdt_carveout(void *fdt, int size, uint32_t address_cells,
+                            uint32_t size_cells)
+{
+       fdt32_t na = cpu_to_fdt32(address_cells);
+       fdt32_t ns = cpu_to_fdt32(size_cells);
+#if defined(DEBUG) && defined(CONFIG_SANDBOX)
+       char filename[512];
+       int fd;
+#endif
+       int err;
+
+       CHECK(fdt_create(fdt, size));
+       CHECK(fdt_finish_reservemap(fdt));
+       CHECK(fdt_begin_node(fdt, ""));
+       CHECK(fdt_property(fdt, "#address-cells", &na, sizeof(na)));
+       CHECK(fdt_property(fdt, "#size-cells", &ns, sizeof(ns)));
+       CHECK(fdt_end_node(fdt));
+       CHECK(fdt_finish(fdt));
+       CHECK(fdt_pack(fdt));
+
+       CHECK(fdt_open_into(fdt, fdt, FDT_SIZE));
+
+       err = make_fdt_carveout_device(fdt, address_cells, size_cells);
+
+#if defined(DEBUG) && defined(CONFIG_SANDBOX)
+       snprintf(filename, sizeof(filename), "/tmp/fdtdec-carveout-%u-%u.dtb",
+                address_cells, size_cells);
+
+       fd = os_open(filename, OS_O_CREAT | OS_O_WRONLY);
+       if (fd < 0) {
+               printf("could not open .dtb file to write\n");
+               goto out;
+       }
+
+       os_write(fd, fdt, size);
+       os_close(fd);
+
+out:
+#endif
+       return err;
+}
+
+static int check_carveout(void)
+{
+       void *fdt;
+
+       fdt = malloc(FDT_SIZE);
+       if (!fdt) {
+               printf("%s: out of memory\n", __func__);
+               return 1;
+       }
+
+#ifndef CONFIG_PHYS_64BIT
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 1, 1), 0);
+       CHECKOK(check_fdt_carveout(fdt, 1, 1));
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 1, 2), 0);
+       CHECKOK(check_fdt_carveout(fdt, 1, 2));
+#else
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 1, 1), -FDT_ERR_BADVALUE);
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 1, 2), -FDT_ERR_BADVALUE);
+#endif
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 2, 1), 0);
+       CHECKOK(check_fdt_carveout(fdt, 2, 1));
+       CHECKVAL(make_fdt_carveout(fdt, FDT_SIZE, 2, 2), 0);
+       CHECKOK(check_fdt_carveout(fdt, 2, 2));
+
+       return 0;
+}
+
 static int do_test_fdtdec(cmd_tbl_t *cmdtp, int flag, int argc,
                          char * const argv[])
 {
@@ -182,6 +332,8 @@ static int do_test_fdtdec(cmd_tbl_t *cmdtp, int flag, int argc,
        CHECKOK(run_test("2a 1a 0a", "a", "  a"));
        CHECKOK(run_test("0a 1a 2a", "a", "a"));
 
+       CHECKOK(check_carveout());
+
        printf("Test passed\n");
        return 0;
 }