kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libfdt: Abolish _typed() variants, add _cell() variants 

In a number of places through libfdt and its tests, we have *_typed()
macro variants on functions which use gcc's typeof and statement
expression extensions to allow passing literals where the underlying
function takes a buffer and size.

These seemed like a good idea at the time, but in fact they have some
problems.  They use typeof and statement expressions, extensions I'd
prefer to avoid for portability.  Plus, they have potential gotchas -
although they'll deal with the size of the thing passed, they won't
deal with other representation issues (like endianness) and results
could be very strange if the type of the expression passed isn't what
you think it is.

In fact, the only users of these _typed() macros were when the value
passed is a single cell (32-bit integer).  Therefore, this patch
removes all these _typed() macros and replaces them with explicit
_cell() variants which handle a single 32-bit integer, and which also
perform endian convesions as appropriate.

With this in place, it now becomes easy to use standardized big-endian
representation for integer valued properties in the testcases,
regardless of the platform we're running on.  We therefore do that,
which has the additional advantage that all the example trees created
during a test run are now byte-for-byte identical regardless of
platform.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
David Gibson 2007-11-20 13:35:46 +11:00 committed by Jon Loeliger
parent 682576d85b
commit 9521dc5ecc
16 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libfdt/libfdt.h
View File

@ -663,12 +663,12 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,


int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
const void *val, int len); const void *val, int len);

static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
#define fdt_setprop_inplace_typed(fdt, nodeoffset, name, val) \ const char *name, uint32_t val)
({ \ {
typeof(val) x = val; \ val = cpu_to_fdt32(val);
fdt_setprop_inplace(fdt, nodeoffset, name, &x, sizeof(x)); \ return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
}) }


int fdt_nop_property(void *fdt, int nodeoffset, const char *name); int fdt_nop_property(void *fdt, int nodeoffset, const char *name);
int fdt_nop_node(void *fdt, int nodeoffset); int fdt_nop_node(void *fdt, int nodeoffset);
@ -682,11 +682,11 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size);
int fdt_finish_reservemap(void *fdt); int fdt_finish_reservemap(void *fdt);
int fdt_begin_node(void *fdt, const char *name); int fdt_begin_node(void *fdt, const char *name);
int fdt_property(void *fdt, const char *name, const void *val, int len); int fdt_property(void *fdt, const char *name, const void *val, int len);
#define fdt_property_typed(fdt, name, val) \ static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
({ \ {
typeof(val) x = (val); \ val = cpu_to_fdt32(val);
fdt_property((fdt), (name), &x, sizeof(x)); \ return fdt_property(fdt, name, &val, sizeof(val));
}) }
#define fdt_property_string(fdt, name, str) \ #define fdt_property_string(fdt, name, str) \
fdt_property(fdt, name, str, strlen(str)+1) fdt_property(fdt, name, str, strlen(str)+1)
int fdt_end_node(void *fdt); int fdt_end_node(void *fdt);
@ -704,11 +704,12 @@ int fdt_del_mem_rsv(void *fdt, int n);


int fdt_setprop(void *fdt, int nodeoffset, const char *name, int fdt_setprop(void *fdt, int nodeoffset, const char *name,
const void *val, int len); const void *val, int len);
#define fdt_setprop_typed(fdt, nodeoffset, name, val) \ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
({ \ uint32_t val)
typeof(val) x = (val); \ {
fdt_setprop((fdt), (nodeoffset), (name), &x, sizeof(x)); \ val = cpu_to_fdt32(val);
}) return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val));
}
#define fdt_setprop_string(fdt, nodeoffset, name, str) \ #define fdt_setprop_string(fdt, nodeoffset, name, str) \
fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
int fdt_delprop(void *fdt, int nodeoffset, const char *name); int fdt_delprop(void *fdt, int nodeoffset, const char *name);

10
tests/del_node.c
View File

@ -48,19 +48,19 @@ int main(int argc, char *argv[])
if (subnode1_offset < 0) if (subnode1_offset < 0)
FAIL("Couldn't find \"/subnode@1\": %s", FAIL("Couldn't find \"/subnode@1\": %s",
fdt_strerror(subnode1_offset)); fdt_strerror(subnode1_offset));
check_getprop_typed(fdt, subnode1_offset, "prop-int", TEST_VALUE_1); check_getprop_cell(fdt, subnode1_offset, "prop-int", TEST_VALUE_1);


subnode2_offset = fdt_path_offset(fdt, "/subnode@2"); subnode2_offset = fdt_path_offset(fdt, "/subnode@2");
if (subnode2_offset < 0) if (subnode2_offset < 0)
FAIL("Couldn't find \"/subnode@2\": %s", FAIL("Couldn't find \"/subnode@2\": %s",
fdt_strerror(subnode2_offset)); fdt_strerror(subnode2_offset));
check_getprop_typed(fdt, subnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);


subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode"); subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
if (subsubnode2_offset < 0) if (subsubnode2_offset < 0)
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s", FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
fdt_strerror(subsubnode2_offset)); fdt_strerror(subsubnode2_offset));
check_getprop_typed(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);


err = fdt_del_node(fdt, subnode1_offset); err = fdt_del_node(fdt, subnode1_offset);
if (err) if (err)
@ -76,13 +76,13 @@ int main(int argc, char *argv[])
if (subnode2_offset < 0) if (subnode2_offset < 0)
FAIL("Couldn't find \"/subnode2\": %s", FAIL("Couldn't find \"/subnode2\": %s",
fdt_strerror(subnode2_offset)); fdt_strerror(subnode2_offset));
check_getprop_typed(fdt, subnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);


subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode"); subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
if (subsubnode2_offset < 0) if (subsubnode2_offset < 0)
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s", FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
fdt_strerror(subsubnode2_offset)); fdt_strerror(subsubnode2_offset));
check_getprop_typed(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);


err = fdt_del_node(fdt, subnode2_offset); err = fdt_del_node(fdt, subnode2_offset);
if (err) if (err)

2
tests/del_property.c
View File

@ -45,7 +45,7 @@ int main(int argc, char *argv[])


oldsize = fdt_totalsize(fdt); oldsize = fdt_totalsize(fdt);


intp = check_getprop_typed(fdt, 0, "prop-int", TEST_VALUE_1); intp = check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);
verbose_printf("int value was 0x%08x\n", *intp); verbose_printf("int value was 0x%08x\n", *intp);


err = fdt_delprop(fdt, 0, "prop-int"); err = fdt_delprop(fdt, 0, "prop-int");

2
tests/find_property.c
View File

@ -35,7 +35,7 @@ int main(int argc, char *argv[])
test_init(argc, argv); test_init(argc, argv);
fdt = load_blob_arg(argc, argv); fdt = load_blob_arg(argc, argv);


check_property_typed(fdt, 0, "prop-int", TEST_VALUE_1); check_property_cell(fdt, 0, "prop-int", TEST_VALUE_1);
check_property(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1, TEST_STRING_1); check_property(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1, TEST_STRING_1);


PASS(); PASS();

2
tests/getprop.c
View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
test_init(argc, argv); test_init(argc, argv);
fdt = load_blob_arg(argc, argv); fdt = load_blob_arg(argc, argv);


check_getprop_typed(fdt, 0, "prop-int", TEST_VALUE_1); check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);
check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1, TEST_STRING_1); check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1, TEST_STRING_1);


PASS(); PASS();

14
tests/node_offset_by_prop_value.c
View File

@ -67,9 +67,9 @@ void check_search_str(void *fdt, const char *propname, const char *propval, ...)
va_end(ap); va_end(ap);
} }


#define check_search_val(fdt, propname, propval, ...) \ #define check_search_cell(fdt, propname, propval, ...) \
{ \ { \
typeof(propval) val = (propval); \ uint32_t val = cpu_to_fdt32(propval); \
check_search((fdt), (propname), &val, sizeof(val), \ check_search((fdt), (propname), &val, sizeof(val), \
##__VA_ARGS__); \ ##__VA_ARGS__); \
} }
@ -92,17 +92,17 @@ int main(int argc, char *argv[])
|| (subsubnode1_offset < 0) || (subsubnode2_offset < 0)) || (subsubnode1_offset < 0) || (subsubnode2_offset < 0))
FAIL("Can't find required nodes"); FAIL("Can't find required nodes");


check_search_val(fdt, "prop-int", TEST_VALUE_1, 0, subnode1_offset, check_search_cell(fdt, "prop-int", TEST_VALUE_1, 0, subnode1_offset,
subsubnode1_offset, -FDT_ERR_NOTFOUND); subsubnode1_offset, -FDT_ERR_NOTFOUND);


check_search_val(fdt, "prop-int", TEST_VALUE_2, subnode2_offset, check_search_cell(fdt, "prop-int", TEST_VALUE_2, subnode2_offset,
subsubnode2_offset, -FDT_ERR_NOTFOUND); subsubnode2_offset, -FDT_ERR_NOTFOUND);


check_search_str(fdt, "prop-str", TEST_STRING_1, 0, -FDT_ERR_NOTFOUND); check_search_str(fdt, "prop-str", TEST_STRING_1, 0, -FDT_ERR_NOTFOUND);


check_search_str(fdt, "prop-str", "no such string", -FDT_ERR_NOTFOUND); check_search_str(fdt, "prop-str", "no such string", -FDT_ERR_NOTFOUND);


check_search_val(fdt, "prop-int", TEST_VALUE_1+1, -FDT_ERR_NOTFOUND); check_search_cell(fdt, "prop-int", TEST_VALUE_1+1, -FDT_ERR_NOTFOUND);


check_search(fdt, "no-such-prop", NULL, 0, -FDT_ERR_NOTFOUND); check_search(fdt, "no-such-prop", NULL, 0, -FDT_ERR_NOTFOUND);



10
tests/nop_node.c
View File

@ -43,19 +43,19 @@ int main(int argc, char *argv[])
if (subnode1_offset < 0) if (subnode1_offset < 0)
FAIL("Couldn't find \"/subnode1\": %s", FAIL("Couldn't find \"/subnode1\": %s",
fdt_strerror(subnode1_offset)); fdt_strerror(subnode1_offset));
check_getprop_typed(fdt, subnode1_offset, "prop-int", TEST_VALUE_1); check_getprop_cell(fdt, subnode1_offset, "prop-int", TEST_VALUE_1);


subnode2_offset = fdt_path_offset(fdt, "/subnode@2"); subnode2_offset = fdt_path_offset(fdt, "/subnode@2");
if (subnode2_offset < 0) if (subnode2_offset < 0)
FAIL("Couldn't find \"/subnode2\": %s", FAIL("Couldn't find \"/subnode2\": %s",
fdt_strerror(subnode2_offset)); fdt_strerror(subnode2_offset));
check_getprop_typed(fdt, subnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);


subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode"); subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
if (subsubnode2_offset < 0) if (subsubnode2_offset < 0)
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s", FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
fdt_strerror(subsubnode2_offset)); fdt_strerror(subsubnode2_offset));
check_getprop_typed(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);


err = fdt_nop_node(fdt, subnode1_offset); err = fdt_nop_node(fdt, subnode1_offset);
if (err) if (err)
@ -71,13 +71,13 @@ int main(int argc, char *argv[])
if (subnode2_offset < 0) if (subnode2_offset < 0)
FAIL("Couldn't find \"/subnode2\": %s", FAIL("Couldn't find \"/subnode2\": %s",
fdt_strerror(subnode2_offset)); fdt_strerror(subnode2_offset));
check_getprop_typed(fdt, subnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);


subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode"); subsubnode2_offset = fdt_path_offset(fdt, "/subnode@2/subsubnode");
if (subsubnode2_offset < 0) if (subsubnode2_offset < 0)
FAIL("Couldn't find \"/subnode@2/subsubnode\": %s", FAIL("Couldn't find \"/subnode@2/subsubnode\": %s",
fdt_strerror(subsubnode2_offset)); fdt_strerror(subsubnode2_offset));
check_getprop_typed(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2); check_getprop_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);


err = fdt_nop_node(fdt, subnode2_offset); err = fdt_nop_node(fdt, subnode2_offset);
if (err) if (err)

2
tests/nop_property.c
View File

@ -41,7 +41,7 @@ int main(int argc, char *argv[])
test_init(argc, argv); test_init(argc, argv);
fdt = load_blob_arg(argc, argv); fdt = load_blob_arg(argc, argv);


intp = check_getprop_typed(fdt, 0, "prop-int", TEST_VALUE_1); intp = check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);
verbose_printf("int value was 0x%08x\n", *intp); verbose_printf("int value was 0x%08x\n", *intp);


err = fdt_nop_property(fdt, 0, "prop-int"); err = fdt_nop_property(fdt, 0, "prop-int");

16
tests/rw_tree1.c
View File

@ -73,27 +73,25 @@ int main(int argc, char *argv[])
CHECK(fdt_add_mem_rsv(fdt, TEST_ADDR_2, TEST_SIZE_2)); CHECK(fdt_add_mem_rsv(fdt, TEST_ADDR_2, TEST_SIZE_2));


CHECK(fdt_setprop_string(fdt, 0, "compatible", "test_tree1")); CHECK(fdt_setprop_string(fdt, 0, "compatible", "test_tree1"));
CHECK(fdt_setprop_typed(fdt, 0, "prop-int", TEST_VALUE_1)); CHECK(fdt_setprop_cell(fdt, 0, "prop-int", TEST_VALUE_1));
CHECK(fdt_setprop_string(fdt, 0, "prop-str", TEST_STRING_1)); CHECK(fdt_setprop_string(fdt, 0, "prop-str", TEST_STRING_1));


OFF_CHECK(offset, fdt_add_subnode(fdt, 0, "subnode@1")); OFF_CHECK(offset, fdt_add_subnode(fdt, 0, "subnode@1"));
CHECK(fdt_setprop_string(fdt, offset, "compatible", "subnode1")); CHECK(fdt_setprop_string(fdt, offset, "compatible", "subnode1"));
CHECK(fdt_setprop_typed(fdt, offset, "prop-int", TEST_VALUE_1)); CHECK(fdt_setprop_cell(fdt, offset, "prop-int", TEST_VALUE_1));
OFF_CHECK(offset, fdt_add_subnode(fdt, offset, "subsubnode")); OFF_CHECK(offset, fdt_add_subnode(fdt, offset, "subsubnode"));
CHECK(fdt_setprop(fdt, offset, "compatible", CHECK(fdt_setprop(fdt, offset, "compatible",
"subsubnode1\0subsubnode", 23)); "subsubnode1\0subsubnode", 23));
CHECK(fdt_setprop_typed(fdt, offset, "prop-int", TEST_VALUE_1)); CHECK(fdt_setprop_cell(fdt, offset, "prop-int", TEST_VALUE_1));


OFF_CHECK(offset, fdt_add_subnode(fdt, 0, "subnode@2")); OFF_CHECK(offset, fdt_add_subnode(fdt, 0, "subnode@2"));
CHECK(fdt_setprop_typed(fdt, offset, "linux,phandle", CHECK(fdt_setprop_cell(fdt, offset, "linux,phandle", PHANDLE_1));
cpu_to_fdt32(PHANDLE_1))); CHECK(fdt_setprop_cell(fdt, offset, "prop-int", TEST_VALUE_2));
CHECK(fdt_setprop_typed(fdt, offset, "prop-int", TEST_VALUE_2));
OFF_CHECK(offset, fdt_add_subnode(fdt, offset, "subsubnode@0")); OFF_CHECK(offset, fdt_add_subnode(fdt, offset, "subsubnode@0"));
CHECK(fdt_setprop_typed(fdt, offset, "linux,phandle", CHECK(fdt_setprop_cell(fdt, offset, "linux,phandle", PHANDLE_2));
cpu_to_fdt32(PHANDLE_2)));
CHECK(fdt_setprop(fdt, offset, "compatible", CHECK(fdt_setprop(fdt, offset, "compatible",
"subsubnode2\0subsubnode", 23)); "subsubnode2\0subsubnode", 23));
CHECK(fdt_setprop_typed(fdt, offset, "prop-int", TEST_VALUE_2)); CHECK(fdt_setprop_cell(fdt, offset, "prop-int", TEST_VALUE_2));


CHECK(fdt_pack(fdt)); CHECK(fdt_pack(fdt));



2
tests/setprop.c
View File

@ -52,7 +52,7 @@ int main(int argc, char *argv[])


fdt = buf; fdt = buf;


intp = check_getprop_typed(fdt, 0, "prop-int", TEST_VALUE_1); intp = check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);


verbose_printf("Old int value was 0x%08x\n", *intp); verbose_printf("Old int value was 0x%08x\n", *intp);
err = fdt_setprop_string(fdt, 0, "prop-int", NEW_STRING); err = fdt_setprop_string(fdt, 0, "prop-int", NEW_STRING);

6
tests/setprop_inplace.c
View File

@ -42,14 +42,14 @@ int main(int argc, char *argv[])
test_init(argc, argv); test_init(argc, argv);
fdt = load_blob_arg(argc, argv); fdt = load_blob_arg(argc, argv);


intp = check_getprop_typed(fdt, 0, "prop-int", TEST_VALUE_1); intp = check_getprop_cell(fdt, 0, "prop-int", TEST_VALUE_1);


verbose_printf("Old int value was 0x%08x\n", *intp); verbose_printf("Old int value was 0x%08x\n", *intp);
err = fdt_setprop_inplace_typed(fdt, 0, "prop-int", ~TEST_VALUE_1); err = fdt_setprop_inplace_cell(fdt, 0, "prop-int", ~TEST_VALUE_1);
if (err) if (err)
FAIL("Failed to set \"prop-int\" to 0x08%x: %s", FAIL("Failed to set \"prop-int\" to 0x08%x: %s",
~TEST_VALUE_1, fdt_strerror(err)); ~TEST_VALUE_1, fdt_strerror(err));
intp = check_getprop_typed(fdt, 0, "prop-int", ~TEST_VALUE_1); intp = check_getprop_cell(fdt, 0, "prop-int", ~TEST_VALUE_1);
verbose_printf("New int value is 0x%08x\n", *intp); verbose_printf("New int value is 0x%08x\n", *intp);


strp = check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1, strp = check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1,

10
tests/subnode_offset.c
View File

@ -70,16 +70,16 @@ int main(int argc, char *argv[])
if (subnode1_offset == subnode2_offset) if (subnode1_offset == subnode2_offset)
FAIL("Different subnodes have same offset"); FAIL("Different subnodes have same offset");


check_property_typed(fdt, subnode1_offset, "prop-int", TEST_VALUE_1); check_property_cell(fdt, subnode1_offset, "prop-int", TEST_VALUE_1);
check_property_typed(fdt, subnode2_offset, "prop-int", TEST_VALUE_2); check_property_cell(fdt, subnode2_offset, "prop-int", TEST_VALUE_2);


subsubnode1_offset = check_subnode(fdt, subnode1_offset, "subsubnode"); subsubnode1_offset = check_subnode(fdt, subnode1_offset, "subsubnode");
subsubnode2_offset = check_subnode(fdt, subnode2_offset, "subsubnode@0"); subsubnode2_offset = check_subnode(fdt, subnode2_offset, "subsubnode@0");
subsubnode2_offset2 = check_subnode(fdt, subnode2_offset, "subsubnode"); subsubnode2_offset2 = check_subnode(fdt, subnode2_offset, "subsubnode");


check_property_typed(fdt, subsubnode1_offset, "prop-int", TEST_VALUE_1); check_property_cell(fdt, subsubnode1_offset, "prop-int", TEST_VALUE_1);
check_property_typed(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2); check_property_cell(fdt, subsubnode2_offset, "prop-int", TEST_VALUE_2);
check_property_typed(fdt, subsubnode2_offset2, "prop-int", TEST_VALUE_2); check_property_cell(fdt, subsubnode2_offset2, "prop-int", TEST_VALUE_2);


if (subsubnode2_offset != subsubnode2_offset2) if (subsubnode2_offset != subsubnode2_offset2)
FAIL("Different offsets with and without unit address"); FAIL("Different offsets with and without unit address");

14
tests/sw_tree1.c
View File

@ -55,27 +55,27 @@ int main(int argc, char *argv[])


CHECK(fdt_begin_node(fdt, "")); CHECK(fdt_begin_node(fdt, ""));
CHECK(fdt_property_string(fdt, "compatible", "test_tree1")); CHECK(fdt_property_string(fdt, "compatible", "test_tree1"));
CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_1));
CHECK(fdt_property_string(fdt, "prop-str", TEST_STRING_1)); CHECK(fdt_property_string(fdt, "prop-str", TEST_STRING_1));


CHECK(fdt_begin_node(fdt, "subnode@1")); CHECK(fdt_begin_node(fdt, "subnode@1"));
CHECK(fdt_property_string(fdt, "compatible", "subnode1")); CHECK(fdt_property_string(fdt, "compatible", "subnode1"));
CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_1));
CHECK(fdt_begin_node(fdt, "subsubnode")); CHECK(fdt_begin_node(fdt, "subsubnode"));
CHECK(fdt_property(fdt, "compatible", "subsubnode1\0subsubnode", CHECK(fdt_property(fdt, "compatible", "subsubnode1\0subsubnode",
23)); 23));
CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_1)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_1));
CHECK(fdt_end_node(fdt)); CHECK(fdt_end_node(fdt));
CHECK(fdt_end_node(fdt)); CHECK(fdt_end_node(fdt));


CHECK(fdt_begin_node(fdt, "subnode@2")); CHECK(fdt_begin_node(fdt, "subnode@2"));
CHECK(fdt_property_typed(fdt, "linux,phandle", cpu_to_fdt32(PHANDLE_1))); CHECK(fdt_property_cell(fdt, "linux,phandle", PHANDLE_1));
CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_2)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_2));
CHECK(fdt_begin_node(fdt, "subsubnode@0")); CHECK(fdt_begin_node(fdt, "subsubnode@0"));
CHECK(fdt_property_typed(fdt, "linux,phandle", cpu_to_fdt32(PHANDLE_2))); CHECK(fdt_property_cell(fdt, "linux,phandle", PHANDLE_2));
CHECK(fdt_property(fdt, "compatible", "subsubnode2\0subsubnode", CHECK(fdt_property(fdt, "compatible", "subsubnode2\0subsubnode",
23)); 23));
CHECK(fdt_property_typed(fdt, "prop-int", TEST_VALUE_2)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_2));
CHECK(fdt_end_node(fdt)); CHECK(fdt_end_node(fdt));
CHECK(fdt_end_node(fdt)); CHECK(fdt_end_node(fdt));



4
tests/testdata.h
View File

@ -20,8 +20,8 @@
#define TEST_ADDR_2 ASM_CONST_LL(123456789) #define TEST_ADDR_2 ASM_CONST_LL(123456789)
#define TEST_SIZE_2 ASM_CONST_LL(010000) #define TEST_SIZE_2 ASM_CONST_LL(010000)


#define TEST_VALUE_1 cell_to_fdt(0xdeadbeef) #define TEST_VALUE_1 0xdeadbeef
#define TEST_VALUE_2 cell_to_fdt(123456789) #define TEST_VALUE_2 123456789


#define PHANDLE_1 0x2000 #define PHANDLE_1 0x2000
#define PHANDLE_2 0x2001 #define PHANDLE_2 0x2001

8
tests/tests.h
View File

@ -112,18 +112,18 @@ void check_mem_rsv(void *fdt, int n, uint64_t addr, uint64_t size);


void check_property(void *fdt, int nodeoffset, const char *name, void check_property(void *fdt, int nodeoffset, const char *name,
int len, const void *val); int len, const void *val);
#define check_property_typed(fdt, nodeoffset, name, val) \ #define check_property_cell(fdt, nodeoffset, name, val) \
({ \ ({ \
typeof(val) x = val; \ uint32_t x = cpu_to_fdt32(val); \
check_property(fdt, nodeoffset, name, sizeof(x), &x); \ check_property(fdt, nodeoffset, name, sizeof(x), &x); \
}) })




const void *check_getprop(void *fdt, int nodeoffset, const char *name, const void *check_getprop(void *fdt, int nodeoffset, const char *name,
int len, const void *val); int len, const void *val);
#define check_getprop_typed(fdt, nodeoffset, name, val) \ #define check_getprop_cell(fdt, nodeoffset, name, val) \
({ \ ({ \
typeof(val) x = val; \ uint32_t x = cpu_to_fdt32(val); \
check_getprop(fdt, nodeoffset, name, sizeof(x), &x); \ check_getprop(fdt, nodeoffset, name, sizeof(x), &x); \
}) })
#define check_getprop_string(fdt, nodeoffset, name, s) \ #define check_getprop_string(fdt, nodeoffset, name, s) \

7
tests/trees.S
View File

@ -50,8 +50,7 @@ tree##_rsvmap_end: ;


#define PROP_INT(tree, name, val) \ #define PROP_INT(tree, name, val) \
PROPHDR(tree, name, 4) \ PROPHDR(tree, name, 4) \
/* For ease of testing the property values go in native-endian */ \ FDTLONG(val) ;
.long val ;


#define PROP_STR(tree, name, str) \ #define PROP_STR(tree, name, str) \
PROPHDR(tree, name, 55f - 54f) \ PROPHDR(tree, name, 55f - 54f) \
@ -100,11 +99,11 @@ test_tree1_struct:
END_NODE END_NODE


BEGIN_NODE("subnode@2") BEGIN_NODE("subnode@2")
PROP_INT(test_tree1, phandle, cell_to_fdt(PHANDLE_1)) PROP_INT(test_tree1, phandle, PHANDLE_1)
PROP_INT(test_tree1, prop_int, TEST_VALUE_2) PROP_INT(test_tree1, prop_int, TEST_VALUE_2)


BEGIN_NODE("subsubnode@0") BEGIN_NODE("subsubnode@0")
PROP_INT(test_tree1, phandle, cell_to_fdt(PHANDLE_2)) PROP_INT(test_tree1, phandle, PHANDLE_2)
PROP_STR(test_tree1, compatible, "subsubnode2\0subsubnode") PROP_STR(test_tree1, compatible, "subsubnode2\0subsubnode")
PROP_INT(test_tree1, prop_int, TEST_VALUE_2) PROP_INT(test_tree1, prop_int, TEST_VALUE_2)
END_NODE END_NODE