Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 15:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

test: Detect a change in the device tree

Browse source 
If the device tree changes during a test and we cannot restore it, mark
it as such so that future tests which need the live tree are skipped.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-09-06 20:27:06 -06:00 committed by Tom Rini
parent 0e4b697f88
commit eb6e903a56
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/asm-generic/global_data.h
View file

@ -646,6 +646,10 @@ enum gd_flags {
* @GD_FLG_SMP_READY: SMP initialization is complete
*/
GD_FLG_SMP_READY = 0x80000,
/**
* @GD_FLG_FDT_CHANGED: Device tree change has been detected by tests
*/
GD_FLG_FDT_CHANGED = 0x100000,
};
#endif /* __ASSEMBLY__ */

19
test/test-main.c
View file

@ -79,6 +79,10 @@ static int dm_test_pre_run(struct unit_test_state *uts)
{
bool of_live = uts->of_live;
if (of_live && (gd->flags & GD_FLG_FDT_CHANGED)) {
printf("Cannot run live tree test as device tree changed\n");
return -EFAULT;
}
uts->root = NULL;
uts->testdev = NULL;
uts->force_fail_alloc = false;
@ -113,9 +117,17 @@ static int dm_test_post_run(struct unit_test_state *uts)
uint chksum;
chksum = crc8(0, gd->fdt_blob, fdt_totalsize(gd->fdt_blob));
if (chksum != uts->fdt_chksum)
if (chksum != uts->fdt_chksum) {
/*
* We cannot run any more tests that need the
* live tree, since its strings point into the
* flat tree, which has changed. This likely
* means that at least some of the pointers from
* the live tree point to different things
*/
printf("Device tree changed: cannot run live tree tests\n");
gd->flags |= GD_FLG_FDT_CHANGED;
}
break;
}
case FDTCHK_NONE:
@ -415,7 +427,8 @@ static int ut_run_test_live_flat(struct unit_test_state *uts,
* or it is a core test.
*/
if (!(test->flags & UT_TESTF_LIVE_TREE) &&
(!runs || ut_test_run_on_flattree(test))) {
(!runs || ut_test_run_on_flattree(test)) &&
!(gd->flags & GD_FLG_FDT_CHANGED)) {
uts->of_live = false;
ut_assertok(ut_run_test(uts, test, test->name));
runs++;