eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dm: core: Allow copying ofnode property data when writing

Browse Source 
At present ofnode_write_prop() is inconsistent between livetree and
flattree, in that livetree requires the caller to ensure the property
value is stable (e.g. in rodata or allocated) but flattree does not, since
it makes a copy.

This makes the API call a bit painful to use, since the caller must do
different things depending on OF_LIVE.

Add a new 'copy' argument which tells the function to make a copy if
needed. Add some tests to cover this behaviour.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2022-09-06 20:27:32 -06:00
committed by Tom Rini
parent 0d63213c1e
commit 0b58eaa89c
4 changed files with 92 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
test/dm/ofnode.c
View File

@@ -822,7 +822,8 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts)
ut_asserteq_64(FDT_ADDR_T_NONE, dev_read_addr(dev));
/* reg = 0x42, size = 0x100 */
ut_assertok(ofnode_write_prop(node, "reg",
"\x00\x00\x00\x42\x00\x00\x01\x00", 8));
"\x00\x00\x00\x42\x00\x00\x01\x00", 8,
false));
ut_asserteq(0x42, dev_read_addr(dev));
/* Test disabling devices */
@@ -838,6 +839,65 @@ static int dm_test_ofnode_livetree_writing(struct unit_test_state *uts)
DM_TEST(dm_test_ofnode_livetree_writing,
UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
static int check_write_prop(struct unit_test_state *uts, ofnode node)
{
char prop[] = "middle-name";
char name[10];
int len;
strcpy(name, "cecil");
len = strlen(name) + 1;
ut_assertok(ofnode_write_prop(node, prop, name, len, false));
ut_asserteq_str(name, ofnode_read_string(node, prop));
/* change the underlying value, this should mess up the live tree */
strcpy(name, "tony");
if (of_live_active()) {
ut_asserteq_str(name, ofnode_read_string(node, prop));
} else {
ut_asserteq_str("cecil", ofnode_read_string(node, prop));
}
/* try again, this time copying the property */
strcpy(name, "mary");
ut_assertok(ofnode_write_prop(node, prop, name, len, true));
ut_asserteq_str(name, ofnode_read_string(node, prop));
strcpy(name, "leah");
/* both flattree and livetree behave the same */
ut_asserteq_str("mary", ofnode_read_string(node, prop));
return 0;
}
/* writing the tree with and without copying the property */
static int dm_test_ofnode_write_copy(struct unit_test_state *uts)
{
ofnode node;
node = ofnode_path("/a-test");
ut_assertok(check_write_prop(uts, node));
return 0;
}
DM_TEST(dm_test_ofnode_write_copy, UT_TESTF_SCAN_FDT);
static int dm_test_ofnode_write_copy_ot(struct unit_test_state *uts)
{
oftree otree = get_other_oftree(uts);
ofnode node, check_node;
node = oftree_path(otree, "/node");
ut_assertok(check_write_prop(uts, node));
/* make sure the control FDT is not touched */
check_node = ofnode_path("/node");
ut_assertnull(ofnode_read_string(check_node, "middle-name"));
return 0;
}
DM_TEST(dm_test_ofnode_write_copy_ot, UT_TESTF_OTHER_FDT);
static int dm_test_ofnode_u32(struct unit_test_state *uts)
{
ofnode node;