diff options
| author |  Frank Rowand <frowand.list@gmail.com>
| 2024-02-16 17:05:55 -0800 |
|---|---|---|
| committer |  Rob Herring <robh@kernel.org>
| 2024-03-08 12:50:39 -0600 |
| commit | d1eabd218edee6a6f0458a8705ebc02b860a624f (patch) | |
| tree | 59ca814dc65bcde15a89dd7859553ba2df5644ac /drivers/of | |
| parent | x86/of: Unconditionally call unflatten_and_copy_device_tree() (diff) | |
| download | linux-d1eabd218edee6a6f0458a8705ebc02b860a624f.tar.gz linux-d1eabd218edee6a6f0458a8705ebc02b860a624f.tar.bz2 linux-d1eabd218edee6a6f0458a8705ebc02b860a624f.zip | |
of: unittest: treat missing of_root as error instead of fixing up
unflatten_device_tree() now ensures that the 'of_root' node is populated
with the root of a default empty devicetree. Remove the unittest code
that created 'of_root' if it was missing. Verify that 'of_root' is valid
before attempting to attach the testcase-data subtree. Remove the
unittest code that unflattens the unittest overlay base if architecture
is UML because that is always done now.
Signed-off-by: Frank Rowand <frowand.list@gmail.com>
Link: https://lore.kernel.org/r/20230317053415.2254616-3-frowand.list@gmail.com
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20240217010557.2381548-7-sboyd@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/unittest.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 891752a20a5f..4c67de37bf26 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -1744,20 +1744,16 @@ static int __init unittest_data_add(void) return -EINVAL; } + /* attach the sub-tree to live tree */ if (!of_root) { - of_root = unittest_data_node; - for_each_of_allnodes(np) - __of_attach_node_sysfs(np); - of_aliases = of_find_node_by_path("/aliases"); - of_chosen = of_find_node_by_path("/chosen"); - of_overlay_mutex_unlock(); - return 0; + pr_warn("%s: no live tree to attach sub-tree\n", __func__); + kfree(unittest_data); + return -ENODEV; } EXPECT_BEGIN(KERN_INFO, "Duplicate name in testcase-data, renamed to \"duplicate-name#1\""); - /* attach the sub-tree to live tree */ np = unittest_data_node->child; while (np) { struct device_node *next = np->sibling; |