mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 20:56:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes and tests for the fdt command

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFFBAABCgAvFiEEslwAIq+Gp8wWVbYnfxc6PpAIreYFAmQLmIQRHHNqZ0BjaHJv
 bWl1bS5vcmcACgkQfxc6PpAIreZ+pgf/YIoUDOMVFtAQ6gZqaF5fPvLUGb10aPpI
 UmjNU87MJ4DJ8DXMAf14MNU4QsEiiz9gZmmrcA9pQ5/fN4BdN4TGi9BSvC287wYv
 CZ5u0OQAz4GrY+3zq+sbj6R+qKHgSDzzMu+EPZcXjtqgY0rgMoThdbLCtkciNLrZ
 8NiINL10cI/RhhhN3mNje7aGzJNmU1KWqfcWBIr0f/c8b8MUKA6N4AQUhR8wABQC
 sR/mS6zBlgFGaOWOHAWt9xDvFEDKzfJerRAAlz9xEd0QirUF0GyQBJd5vTzkIaTT
 Lme8zMI6iy/yKs+wZcfchfYY3tkpyue5U61jKplJOPUEl2dfrBly/w==
 =yoN9
 -----END PGP SIGNATURE-----

Merge tag 'dm-pull-10mar23' of https://source.denx.de/u-boot/custodians/u-boot-dm

fixes and tests for the fdt command
This commit is contained in:
Tom Rini 2023-03-10 16:01:52 -05:00
commit 6c1cdf158c
3 changed files with 852 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
cmd/fdt.c
View File

@ -77,7 +77,17 @@ static int fdt_value_env_set(const void *nodep, int len,
sprintf(buf, "0x%08X", fdt32_to_cpu(*(fdt32_t *)nodep));
env_set(var, buf);
} else if (len%4 == 0 && len <= 20) {
} else if (len % 4 == 0 && index >= 0) {
/* Needed to print integer arrays. */
const unsigned int *nodec = (const unsigned int *)nodep;
char buf[11];
if (index * 4 >= len)
return 1;
sprintf(buf, "0x%08X", fdt32_to_cpu(*(nodec + index)));
env_set(var, buf);
} else if (len % 4 == 0 && len <= 20) {
/* Needed to print things like sha1 hashes. */
char buf[41];
int i;
@ -446,15 +456,17 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
} else {
nodep = fdt_getprop(
working_fdt, nodeoffset, prop, &len);
if (len == 0) {
/* no property value */
env_set(var, "");
return 0;
} else if (nodep && len > 0) {
if (nodep && len >= 0) {
if (subcmd[0] == 'v') {
int index = 0;
int index = -1;
int ret;
if (len == 0) {
/* no property value */
env_set(var, "");
return 0;
}
if (argc == 7)
index = simple_strtoul(argv[6], NULL, 10);
@ -464,9 +476,10 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
return ret;
} else if (subcmd[0] == 'a') {
/* Get address */
char buf[11];
char buf[19];
sprintf(buf, "0x%p", nodep);
snprintf(buf, sizeof(buf), "0x%lx",
(ulong)map_to_sysmem(nodep));
env_set(var, buf);
} else if (subcmd[0] == 's') {
/* Get size */
@ -545,16 +558,16 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
if (argc > 3) {
err = fdt_delprop(working_fdt, nodeoffset, argv[3]);
if (err < 0) {
printf("libfdt fdt_delprop(): %s\n",
printf("libfdt fdt_delprop(): %s\n",
fdt_strerror(err));
return err;
return CMD_RET_FAILURE;
}
} else {
err = fdt_del_node(working_fdt, nodeoffset);
if (err < 0) {
printf("libfdt fdt_del_node(): %s\n",
printf("libfdt fdt_del_node(): %s\n",
fdt_strerror(err));
return err;
return CMD_RET_FAILURE;
}
}
@ -595,7 +608,12 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
* Set boot cpu id
*/
} else if (strncmp(argv[1], "boo", 3) == 0) {
unsigned long tmp = hextoul(argv[2], NULL);
unsigned long tmp;
if (argc != 3)
return CMD_RET_USAGE;
tmp = hextoul(argv[2], NULL);
fdt_set_boot_cpuid_phys(working_fdt, tmp);
/*
@ -604,6 +622,10 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
} else if (strncmp(argv[1], "me", 2) == 0) {
uint64_t addr, size;
int err;
if (argc != 4)
return CMD_RET_USAGE;
addr = simple_strtoull(argv[2], NULL, 16);
size = simple_strtoull(argv[3], NULL, 16);
err = fdt_fixup_memory(working_fdt, addr, size);
@ -642,18 +664,18 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
err = fdt_add_mem_rsv(working_fdt, addr, size);
if (err < 0) {
printf("libfdt fdt_add_mem_rsv(): %s\n",
printf("libfdt fdt_add_mem_rsv(): %s\n",
fdt_strerror(err));
return err;
return CMD_RET_FAILURE;
}
} else if (argv[2][0] == 'd') {
unsigned long idx = hextoul(argv[3], NULL);
int err = fdt_del_mem_rsv(working_fdt, idx);
if (err < 0) {
printf("libfdt fdt_del_mem_rsv(): %s\n",
printf("libfdt fdt_del_mem_rsv(): %s\n",
fdt_strerror(err));
return err;
return CMD_RET_FAILURE;
}
} else {
/* Unrecognized command */
@ -878,41 +900,33 @@ static int fdt_parse_prop(char * const *newval, int count, char *data, int *len)
static int is_printable_string(const void *data, int len)
{
const char *s = data;
const char *ss, *se;
/* zero length is not */
if (len == 0)
return 0;
/* must terminate with zero or '\n' */
if (s[len - 1] != '\0' && s[len - 1] != '\n')
/* must terminate with zero */
if (s[len - 1] != '\0')
return 0;
/* printable or a null byte (concatenated strings) */
while (((*s == '\0') || isprint(*s) || isspace(*s)) && (len > 0)) {
/*
* If we see a null, there are three possibilities:
* 1) If len == 1, it is the end of the string, printable
* 2) Next character also a null, not printable.
* 3) Next character not a null, continue to check.
*/
if (s[0] == '\0') {
if (len == 1)
return 1;
if (s[1] == '\0')
return 0;
}
se = s + len;
while (s < se) {
ss = s;
while (s < se && *s && isprint((unsigned char)*s))
s++;
/* not zero, or not done yet */
if (*s != '\0' || s == ss)
return 0;
s++;
len--;
}
/* Not the null termination, or not done yet: not printable */
if (*s != '\0' || (len != 0))
return 0;
return 1;
}
/*
* Print the property in the best format, a heuristic guess. Print as
* a string, concatenated strings, a byte, word, double word, or (if all
@ -1135,8 +1149,8 @@ static char fdt_help_text[] =
" <start>/<size> - initrd start addr/size\n"
#if defined(CONFIG_FIT_SIGNATURE)
"fdt checksign [<addr>] - check FIT signature\n"
" <start> - addr of key blob\n"
" default gd->fdt_blob\n"
" <addr> - address of key blob\n"
" default gd->fdt_blob\n"
#endif
"NOTE: Dereference aliases by omitting the leading '/', "
"e.g. fdt print ethernet0.";

4
include/test/ut.h
View File

@ -334,6 +334,10 @@ int ut_check_console_dump(struct unit_test_state *uts, int total_bytes);
return CMD_RET_FAILURE; \
} \
/* Assert that the next console output line is empty */
#define ut_assert_nextline_empty() \
ut_assert_nextline("%s", "")
/**
* ut_check_free() - Return the number of bytes free in the malloc() pool
*

815
test/cmd/fdt.c
View File

@ -39,6 +39,102 @@ static int make_test_fdt(struct unit_test_state *uts, void *fdt, int size)
return 0;
}
/**
* make_fuller_fdt() - Create an FDT with root node and properties
*
* The size is set to the minimum needed
*
* @uts: Test state
* @fdt: Place to write FDT
* @size: Maximum size of space for fdt
*/
static int make_fuller_fdt(struct unit_test_state *uts, void *fdt, int size)
{
fdt32_t regs[2] = { cpu_to_fdt32(0x1234), cpu_to_fdt32(0x1000) };
/*
* Assemble the following DT for test purposes:
*
* / {
* #address-cells = <0x00000001>;
* #size-cells = <0x00000001>;
* compatible = "u-boot,fdt-test";
* model = "U-Boot FDT test";
*
* aliases {
* badalias = "/bad/alias";
* subnodealias = "/test-node@1234/subnode";
* testnodealias = "/test-node@1234";
* };
*
* test-node@1234 {
* #address-cells = <0x00000000>;
* #size-cells = <0x00000000>;
* compatible = "u-boot,fdt-test-device1";
* clock-names = "fixed", "i2c", "spi", "uart2", "uart1";
* u-boot,empty-property;
* clock-frequency = <0x00fde800>;
* regs = <0x00001234 0x00001000>;
*
* subnode {
* #address-cells = <0x00000000>;
* #size-cells = <0x00000000>;
* compatible = "u-boot,fdt-subnode-test-device";
* };
* };
* };
*/
ut_assertok(fdt_create(fdt, size));
ut_assertok(fdt_finish_reservemap(fdt));
ut_assert(fdt_begin_node(fdt, "") >= 0);
ut_assertok(fdt_property_u32(fdt, "#address-cells", 1));
ut_assertok(fdt_property_u32(fdt, "#size-cells", 1));
/* <string> */
ut_assertok(fdt_property_string(fdt, "compatible", "u-boot,fdt-test"));
/* <string> */
ut_assertok(fdt_property_string(fdt, "model", "U-Boot FDT test"));
ut_assert(fdt_begin_node(fdt, "aliases") >= 0);
/* <string> */
ut_assertok(fdt_property_string(fdt, "badalias", "/bad/alias"));
/* <string> */
ut_assertok(fdt_property_string(fdt, "subnodealias", "/test-node@1234/subnode"));
/* <string> */
ut_assertok(fdt_property_string(fdt, "testnodealias", "/test-node@1234"));
ut_assertok(fdt_end_node(fdt));
ut_assert(fdt_begin_node(fdt, "test-node@1234") >= 0);
ut_assertok(fdt_property_cell(fdt, "#address-cells", 0));
ut_assertok(fdt_property_cell(fdt, "#size-cells", 0));
/* <string> */
ut_assertok(fdt_property_string(fdt, "compatible", "u-boot,fdt-test-device1"));
/* <stringlist> */
ut_assertok(fdt_property(fdt, "clock-names", "fixed\0i2c\0spi\0uart2\0uart1\0", 26));
/* <empty> */
ut_assertok(fdt_property(fdt, "u-boot,empty-property", NULL, 0));
/*
* <u32>
* This value is deliberate as it used to break cmd/fdt.c
* is_printable_string() implementation.
*/
ut_assertok(fdt_property_u32(fdt, "clock-frequency", 16640000));
/* <prop-encoded-array> */
ut_assertok(fdt_property(fdt, "regs", &regs, sizeof(regs)));
ut_assert(fdt_begin_node(fdt, "subnode") >= 0);
ut_assertok(fdt_property_cell(fdt, "#address-cells", 0));
ut_assertok(fdt_property_cell(fdt, "#size-cells", 0));
ut_assertok(fdt_property_string(fdt, "compatible", "u-boot,fdt-subnode-test-device"));
ut_assertok(fdt_end_node(fdt));
ut_assertok(fdt_end_node(fdt));
ut_assertok(fdt_end_node(fdt));
ut_assertok(fdt_finish(fdt));
return 0;
}
/* Test 'fdt addr' getting/setting address */
static int fdt_test_addr(struct unit_test_state *uts)
{
@ -108,7 +204,7 @@ static int fdt_test_addr(struct unit_test_state *uts)
FDT_TEST(fdt_test_addr, UT_TESTF_CONSOLE_REC);
/* Test 'fdt addr' resizing an fdt */
static int fdt_test_resize(struct unit_test_state *uts)
static int fdt_test_addr_resize(struct unit_test_state *uts)
{
char fdt[256];
const int newsize = sizeof(fdt) / 2;
@ -140,60 +236,733 @@ static int fdt_test_resize(struct unit_test_state *uts)
return 0;
}
FDT_TEST(fdt_test_resize, UT_TESTF_CONSOLE_REC);
FDT_TEST(fdt_test_addr_resize, UT_TESTF_CONSOLE_REC);
/* Test 'fdt get' reading an fdt */
static int fdt_test_get(struct unit_test_state *uts)
static int fdt_test_move(struct unit_test_state *uts)
{
ulong addr;
char fdt[256];
ulong addr, newaddr = 0x10000;
const int size = sizeof(fdt);
uint32_t ts;
void *buf;
addr = map_to_sysmem(gd->fdt_blob);
/* Original source DT */
ut_assertok(make_test_fdt(uts, fdt, size));
ts = fdt_totalsize(fdt);
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test getting default element of /clk-test node clock-names property */
/* Moved target DT location */
buf = map_sysmem(newaddr, size);
memset(buf, 0, size);
/* Test moving the working FDT to a new location */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get value fdflt /clk-test clock-names", 0));
ut_asserteq_str("fixed", env_get("fdflt"));
ut_assertok(run_commandf("fdt move %08x %08x %x", addr, newaddr, ts));
ut_assert_nextline("Working FDT set to %lx", newaddr);
ut_assertok(ut_check_console_end(uts));
/* Test getting 0th element of /clk-test node clock-names property */
/* Compare the source and destination DTs */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get value fzero /clk-test clock-names 0", 0));
ut_asserteq_str("fixed", env_get("fzero"));
ut_assertok(run_commandf("cmp.b %08x %08x %x", addr, newaddr, ts));
ut_assert_nextline("Total of %d byte(s) were the same", ts);
ut_assertok(ut_check_console_end(uts));
/* Test getting 1st element of /clk-test node clock-names property */
return 0;
}
FDT_TEST(fdt_test_move, UT_TESTF_CONSOLE_REC);
static int fdt_test_resize(struct unit_test_state *uts)
{
char fdt[256];
const unsigned int newsize = 0x2000;
uint32_t ts;
ulong addr;
/* Original source DT */
ut_assertok(make_test_fdt(uts, fdt, sizeof(fdt)));
fdt_shrink_to_minimum(fdt, 0); /* Resize with 0 extra bytes */
ts = fdt_totalsize(fdt);
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test resizing the working FDT and verify the new space was added */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get value fone /clk-test clock-names 1", 0));
ut_asserteq_str("i2c", env_get("fone"));
ut_assertok(run_commandf("fdt resize %x", newsize));
ut_asserteq(ts + newsize, fdt_totalsize(fdt));
ut_assertok(ut_check_console_end(uts));
/* Test getting 2nd element of /clk-test node clock-names property */
return 0;
}
FDT_TEST(fdt_test_resize, UT_TESTF_CONSOLE_REC);
/* Test 'fdt get value' reading an fdt */
static int fdt_test_get_value_string(struct unit_test_state *uts,
const char *node, const char *prop,
const char *idx, const char *strres,
const int intres)
{
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get value ftwo /clk-test clock-names 2", 0));
ut_asserteq_str("spi", env_get("ftwo"));
ut_assertok(run_commandf("fdt get value var %s %s %s",
node, prop, idx ? : ""));
if (strres) {
ut_asserteq_str(strres, env_get("var"));
} else {
ut_asserteq(intres, env_get_hex("var", 0x1234));
}
ut_assertok(ut_check_console_end(uts));
/* Test missing 10th element of /clk-test node clock-names property */
return 0;
}
static int fdt_test_get_value_common(struct unit_test_state *uts,
const char *node)
{
/* Test getting default element of $node node clock-names property */
fdt_test_get_value_string(uts, node, "clock-names", NULL, "fixed", 0);
/* Test getting 0th element of $node node clock-names property */
fdt_test_get_value_string(uts, node, "clock-names", "0", "fixed", 0);
/* Test getting 1st element of $node node clock-names property */
fdt_test_get_value_string(uts, node, "clock-names", "1", "i2c", 0);
/* Test getting 2nd element of $node node clock-names property */
fdt_test_get_value_string(uts, node, "clock-names", "2", "spi", 0);
/*
* Test getting default element of $node node regs property.
* The result here is highly unusual, the non-index value read from
* integer array is a string of concatenated values from the array,
* but only if the array is shorter than 40 characters. Anything
* longer is an error. This is a special case for handling hashes.
*/
fdt_test_get_value_string(uts, node, "regs", NULL, "3412000000100000", 0);
/* Test getting 0th element of $node node regs property */
fdt_test_get_value_string(uts, node, "regs", "0", NULL, 0x1234);
/* Test getting 1st element of $node node regs property */
fdt_test_get_value_string(uts, node, "regs", "1", NULL, 0x1000);
/* Test missing 10th element of $node node clock-names property */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get value ftwo /clk-test clock-names 10", 0));
ut_asserteq(1, run_commandf("fdt get value ften %s clock-names 10", node));
ut_assertok(ut_check_console_end(uts));
/* Test getting default element of /clk-test node nonexistent property */
/* Test missing 10th element of $node node regs property */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get value fnone /clk-test nonexistent", 1));
ut_asserteq(1, run_commandf("fdt get value ften %s regs 10", node));
ut_assertok(ut_check_console_end(uts));
/* Test getting default element of $node node nonexistent property */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt get value fnone %s nonexistent", node));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
return 0;
}
static int fdt_test_get_value(struct unit_test_state *uts)
{
char fdt[4096];
ulong addr;
int ret;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
ret = fdt_test_get_value_common(uts, "/test-node@1234");
if (!ret)
ret = fdt_test_get_value_common(uts, "testnodealias");
if (ret)
return ret;
/* Test getting default element of /nonexistent node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get value fnode /nonexistent nonexistent", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting default element of bad alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get value vbadalias badalias nonexistent", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting default element of nonexistent alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get value vnoalias noalias nonexistent", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_get, UT_TESTF_CONSOLE_REC);
FDT_TEST(fdt_test_get_value, UT_TESTF_CONSOLE_REC);
static int fdt_test_get_name(struct unit_test_state *uts)
{
char fdt[4096];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test getting name of node 0 in /, which is /aliases node */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get name nzero / 0", 0));
ut_asserteq_str("aliases", env_get("nzero"));
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node 1 in /, which is /test-node@1234 node */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get name none / 1", 0));
ut_asserteq_str("test-node@1234", env_get("none"));
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node -1 in /, which is /aliases node, same as 0 */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get name nmone / -1", 0));
ut_asserteq_str("aliases", env_get("nmone"));
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node 2 in /, which does not exist */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get name ntwo / 2", 1));
ut_assert_nextline("libfdt node not found");
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node 0 in /test-node@1234, which is /subnode node */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get name snzero /test-node@1234 0", 0));
ut_asserteq_str("subnode", env_get("snzero"));
ut_assertok(run_command("fdt get name asnzero testnodealias 0", 0));
ut_asserteq_str("subnode", env_get("asnzero"));
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node 1 in /test-node@1234, which does not exist */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get name snone /test-node@1234 1", 1));
ut_assert_nextline("libfdt node not found");
ut_asserteq(1, run_command("fdt get name asnone testnodealias 1", 1));
ut_assert_nextline("libfdt node not found");
ut_assertok(ut_check_console_end(uts));
/* Test getting name of node -1 in /test-node@1234, which is /subnode node, same as 0 */
ut_assertok(console_record_reset_enable());
ut_assertok(run_command("fdt get name snmone /test-node@1234 -1", 0));
ut_asserteq_str("subnode", env_get("snmone"));
ut_assertok(run_command("fdt get name asnmone testnodealias -1", 0));
ut_asserteq_str("subnode", env_get("asnmone"));
ut_assertok(ut_check_console_end(uts));
/* Test getting name of nonexistent node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get name nonode /nonexistent 0", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting name of bad alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get name vbadalias badalias 0", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting name of nonexistent alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get name vnoalias noalias 0", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_get_name, UT_TESTF_CONSOLE_REC);
static int fdt_test_get_addr_common(struct unit_test_state *uts, char *fdt,
const char *path, const char *prop)
{
unsigned int offset;
int path_offset;
void *prop_ptr;
int len = 0;
path_offset = fdt_path_offset(fdt, path);
ut_assert(path_offset >= 0);
prop_ptr = (void *)fdt_getprop(fdt, path_offset, prop, &len);
ut_assertnonnull(prop_ptr);
offset = (char *)prop_ptr - fdt;
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt get addr pstr %s %s", path, prop));
ut_asserteq((ulong)map_sysmem(env_get_hex("fdtaddr", 0x1234), 0),
(ulong)(map_sysmem(env_get_hex("pstr", 0x1234), 0) - offset));
ut_assertok(ut_check_console_end(uts));
return 0;
}
static int fdt_test_get_addr(struct unit_test_state *uts)
{
char fdt[4096];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test getting address of root node / string property "compatible" */
fdt_test_get_addr_common(uts, fdt, "/", "compatible");
/* Test getting address of node /test-node@1234 stringlist property "clock-names" */
fdt_test_get_addr_common(uts, fdt, "/test-node@1234", "clock-names");
fdt_test_get_addr_common(uts, fdt, "testnodealias", "clock-names");
/* Test getting address of node /test-node@1234 u32 property "clock-frequency" */
fdt_test_get_addr_common(uts, fdt, "/test-node@1234", "clock-frequency");
fdt_test_get_addr_common(uts, fdt, "testnodealias", "clock-frequency");
/* Test getting address of node /test-node@1234 empty property "u-boot,empty-property" */
fdt_test_get_addr_common(uts, fdt, "/test-node@1234", "u-boot,empty-property");
fdt_test_get_addr_common(uts, fdt, "testnodealias", "u-boot,empty-property");
/* Test getting address of node /test-node@1234 array property "regs" */
fdt_test_get_addr_common(uts, fdt, "/test-node@1234", "regs");
fdt_test_get_addr_common(uts, fdt, "testnodealias", "regs");
/* Test getting address of node /test-node@1234/subnode non-existent property "noprop" */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get addr pnoprop /test-node@1234/subnode noprop", 1));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting address of non-existent node /test-node@1234/nonode@1 property "noprop" */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get addr pnonode /test-node@1234/nonode@1 noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_get_addr, UT_TESTF_CONSOLE_REC);
static int fdt_test_get_size_common(struct unit_test_state *uts,
const char *path, const char *prop,
const unsigned int val)
{
ut_assertok(console_record_reset_enable());
if (prop) {
ut_assertok(run_commandf("fdt get size sstr %s %s", path, prop));
} else {
ut_assertok(run_commandf("fdt get size sstr %s", path));
}
ut_asserteq(val, env_get_hex("sstr", 0x1234));
ut_assertok(ut_check_console_end(uts));
return 0;
}
static int fdt_test_get_size(struct unit_test_state *uts)
{
char fdt[4096];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test getting size of root node / string property "compatible" */
fdt_test_get_size_common(uts, "/", "compatible", 16);
/* Test getting size of node /test-node@1234 stringlist property "clock-names" */
fdt_test_get_size_common(uts, "/test-node@1234", "clock-names", 26);
fdt_test_get_size_common(uts, "testnodealias", "clock-names", 26);
/* Test getting size of node /test-node@1234 u32 property "clock-frequency" */
fdt_test_get_size_common(uts, "/test-node@1234", "clock-frequency", 4);
fdt_test_get_size_common(uts, "testnodealias", "clock-frequency", 4);
/* Test getting size of node /test-node@1234 empty property "u-boot,empty-property" */
fdt_test_get_size_common(uts, "/test-node@1234", "u-boot,empty-property", 0);
fdt_test_get_size_common(uts, "testnodealias", "u-boot,empty-property", 0);
/* Test getting size of node /test-node@1234 array property "regs" */
fdt_test_get_size_common(uts, "/test-node@1234", "regs", 8);
fdt_test_get_size_common(uts, "testnodealias", "regs", 8);
/* Test getting node count of node / */
fdt_test_get_size_common(uts, "/", NULL, 2);
/* Test getting node count of node /test-node@1234/subnode */
fdt_test_get_size_common(uts, "/test-node@1234/subnode", NULL, 0);
fdt_test_get_size_common(uts, "subnodealias", NULL, 0);
/* Test getting size of node /test-node@1234/subnode non-existent property "noprop" */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get size pnoprop /test-node@1234/subnode noprop", 1));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_asserteq(1, run_command("fdt get size pnoprop subnodealias noprop", 1));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting size of non-existent node /test-node@1234/nonode@1 property "noprop" */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get size pnonode /test-node@1234/nonode@1 noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting node count of non-existent node /test-node@1234/nonode@1 */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get size pnonode /test-node@1234/nonode@1", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting node count of bad alias badalias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get size pnonode badalias noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test getting node count of non-existent alias noalias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt get size pnonode noalias", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_get_size, UT_TESTF_CONSOLE_REC);
static int fdt_test_set_single(struct unit_test_state *uts,
const char *path, const char *prop,
const char *sval, int ival, bool integer)
{
/*
* Set single element string/integer/<empty> property into DT, that is:
* => fdt set /path property string
* => fdt set /path property integer
* => fdt set /path property
*/
ut_assertok(console_record_reset_enable());
if (sval) {
ut_assertok(run_commandf("fdt set %s %s %s", path, prop, sval));
} else if (integer) {
ut_assertok(run_commandf("fdt set %s %s <%d>", path, prop, ival));
} else {
ut_assertok(run_commandf("fdt set %s %s", path, prop));
}
/* Validate the property is present and has correct value. */
ut_assertok(run_commandf("fdt get value svar %s %s", path, prop));
if (sval) {
ut_asserteq_str(sval, env_get("svar"));
} else if (integer) {
ut_asserteq(ival, env_get_hex("svar", 0x1234));
} else {
ut_assertnull(env_get("svar"));
}
ut_assertok(ut_check_console_end(uts));
return 0;
}
static int fdt_test_set_multi(struct unit_test_state *uts,
const char *path, const char *prop,
const char *sval1, const char *sval2,
int ival1, int ival2)
{
/*
* Set multi element string/integer array property in DT, that is:
* => fdt set /path property <string1 string2>
* => fdt set /path property <integer1 integer2>
*
* The set is done twice in here deliberately, The first set adds
* the property with an extra trailing element in its array to make
* the array longer, the second set is the expected final content of
* the array property. The longer array is used to verify that the
* new array is correctly sized and read past the new array length
* triggers failure.
*/
ut_assertok(console_record_reset_enable());
if (sval1 && sval2) {
ut_assertok(run_commandf("fdt set %s %s %s %s end", path, prop, sval1, sval2));
ut_assertok(run_commandf("fdt set %s %s %s %s", path, prop, sval1, sval2));
} else {
ut_assertok(run_commandf("fdt set %s %s <%d %d 10>", path, prop, ival1, ival2));
ut_assertok(run_commandf("fdt set %s %s <%d %d>", path, prop, ival1, ival2));
}
/*
* Validate the property is present and has correct value.
*
* The "end/10" above and "svarn" below is used to validate that
* previous 'fdt set' to longer array does not polute newly set
* shorter array.
*/
ut_assertok(run_commandf("fdt get value svar1 %s %s 0", path, prop));
ut_assertok(run_commandf("fdt get value svar2 %s %s 1", path, prop));
ut_asserteq(1, run_commandf("fdt get value svarn %s %s 2", path, prop));
if (sval1 && sval2) {
ut_asserteq_str(sval1, env_get("svar1"));
ut_asserteq_str(sval2, env_get("svar2"));
ut_assertnull(env_get("svarn"));
} else {
ut_asserteq(ival1, env_get_hex("svar1", 0x1234));
ut_asserteq(ival2, env_get_hex("svar2", 0x1234));
ut_assertnull(env_get("svarn"));
}
ut_assertok(ut_check_console_end(uts));
return 0;
}
static int fdt_test_set_node(struct unit_test_state *uts,
const char *path, const char *prop)
{
fdt_test_set_single(uts, path, prop, "new", 0, false);
fdt_test_set_single(uts, path, prop, "rewrite", 0, false);
fdt_test_set_single(uts, path, prop, NULL, 42, true);
fdt_test_set_single(uts, path, prop, NULL, 0, false);
fdt_test_set_multi(uts, path, prop, NULL, NULL, 42, 1701);
fdt_test_set_multi(uts, path, prop, NULL, NULL, 74656, 9);
fdt_test_set_multi(uts, path, prop, "42", "1701", 0, 0);
fdt_test_set_multi(uts, path, prop, "74656", "9", 0, 0);
return 0;
}
static int fdt_test_set(struct unit_test_state *uts)
{
char fdt[8192];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
fdt_shrink_to_minimum(fdt, 4096); /* Resize with 4096 extra bytes */
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test setting of root node / existing property "compatible" */
fdt_test_set_node(uts, "/", "compatible");
/* Test setting of root node / new property "newproperty" */
fdt_test_set_node(uts, "/", "newproperty");
/* Test setting of subnode existing property "compatible" */
fdt_test_set_node(uts, "/test-node@1234/subnode", "compatible");
fdt_test_set_node(uts, "subnodealias", "compatible");
/* Test setting of subnode new property "newproperty" */
fdt_test_set_node(uts, "/test-node@1234/subnode", "newproperty");
fdt_test_set_node(uts, "subnodealias", "newproperty");
/* Test setting property of non-existent node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt set /no-node noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test setting property of non-existent alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt set noalias noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
/* Test setting property of bad alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_command("fdt set badalias noprop", 1));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_set, UT_TESTF_CONSOLE_REC);
static int fdt_test_mknode(struct unit_test_state *uts)
{
char fdt[8192];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
fdt_shrink_to_minimum(fdt, 4096); /* Resize with 4096 extra bytes */
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test creation of new node in / */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt mknode / newnode"));
ut_assertok(run_commandf("fdt list /newnode"));
ut_assert_nextline("newnode {");
ut_assert_nextline("};");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in /test-node@1234 */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt mknode /test-node@1234 newsubnode"));
ut_assertok(run_commandf("fdt list /test-node@1234/newsubnode"));
ut_assert_nextline("newsubnode {");
ut_assert_nextline("};");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in /test-node@1234 by alias */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt mknode testnodealias newersubnode"));
ut_assertok(run_commandf("fdt list testnodealias/newersubnode"));
ut_assert_nextline("newersubnode {");
ut_assert_nextline("};");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in /test-node@1234 over existing node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt mknode testnodealias newsubnode"));
ut_assert_nextline("libfdt fdt_add_subnode(): FDT_ERR_EXISTS");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in /test-node@1234 by alias over existing node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt mknode testnodealias newersubnode"));
ut_assert_nextline("libfdt fdt_add_subnode(): FDT_ERR_EXISTS");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in non-existent node */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt mknode /no-node newnosubnode"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in non-existent alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt mknode noalias newfailsubnode"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
/* Test creation of new node in bad alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt mknode badalias newbadsubnode"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_mknode, UT_TESTF_CONSOLE_REC);
static int fdt_test_rm(struct unit_test_state *uts)
{
char fdt[4096];
ulong addr;
ut_assertok(make_fuller_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test removal of property in root node / */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt print / compatible"));
ut_assert_nextline("compatible = \"u-boot,fdt-test\"");
ut_assertok(run_commandf("fdt rm / compatible"));
ut_asserteq(1, run_commandf("fdt print / compatible"));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of property clock-names in subnode /test-node@1234 */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt print /test-node@1234 clock-names"));
ut_assert_nextline("clock-names = \"fixed\", \"i2c\", \"spi\", \"uart2\", \"uart1\"");
ut_assertok(run_commandf("fdt rm /test-node@1234 clock-names"));
ut_asserteq(1, run_commandf("fdt print /test-node@1234 clock-names"));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of property u-boot,empty-property in subnode /test-node@1234 by alias */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt print testnodealias u-boot,empty-property"));
ut_assert_nextline("testnodealias u-boot,empty-property");
ut_assertok(run_commandf("fdt rm testnodealias u-boot,empty-property"));
ut_asserteq(1, run_commandf("fdt print testnodealias u-boot,empty-property"));
ut_assert_nextline("libfdt fdt_getprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of non-existent property noprop in subnode /test-node@1234 */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt rm /test-node@1234 noprop"));
ut_assert_nextline("libfdt fdt_delprop(): FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of non-existent node /no-node@5678 */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt rm /no-node@5678"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of subnode /test-node@1234/subnode by alias */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt rm subnodealias"));
ut_asserteq(1, run_commandf("fdt print /test-node@1234/subnode"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of node by non-existent alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt rm noalias"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
/* Test removal of node by bad alias */
ut_assertok(console_record_reset_enable());
ut_asserteq(1, run_commandf("fdt rm noalias"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_BADPATH");
ut_assertok(ut_check_console_end(uts));
/* Test removal of node /test-node@1234 */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt rm /test-node@1234"));
ut_asserteq(1, run_commandf("fdt print /test-node@1234"));
ut_assert_nextline("libfdt fdt_path_offset() returned FDT_ERR_NOTFOUND");
ut_assertok(ut_check_console_end(uts));
/* Test removal of node / */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt rm /"));
ut_asserteq(1, run_commandf("fdt print /"));
ut_assertok(ut_check_console_end(uts));
return 0;
}
FDT_TEST(fdt_test_rm, UT_TESTF_CONSOLE_REC);
static int fdt_test_bootcpu(struct unit_test_state *uts)
{
char fdt[256];
ulong addr;
int i;
ut_assertok(make_test_fdt(uts, fdt, sizeof(fdt)));
addr = map_to_sysmem(fdt);
set_working_fdt_addr(addr);
/* Test getting default bootcpu entry */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt header get bootcpu boot_cpuid_phys"));
ut_asserteq(0, env_get_ulong("bootcpu", 10, 0x1234));
ut_assertok(ut_check_console_end(uts));
/* Test setting and getting new bootcpu entry, twice, to test overwrite */
for (i = 42; i <= 43; i++) {
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt bootcpu %d", i));
ut_assertok(ut_check_console_end(uts));
/* Test getting new bootcpu entry */
ut_assertok(console_record_reset_enable());
ut_assertok(run_commandf("fdt header get bootcpu boot_cpuid_phys"));
ut_asserteq(i, env_get_ulong("bootcpu", 10, 0x1234));
ut_assertok(ut_check_console_end(uts));
}
return 0;
}
FDT_TEST(fdt_test_bootcpu, UT_TESTF_CONSOLE_REC);
int do_ut_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{