diff options
| author | Frank Rowand <frank.rowand@sony.com> | 2018-02-12 09:25:04 +0100 |
|---|---|---|
| committer | Frank Rowand <frowand.list@gmail.com> | 2018-03-04 09:29:40 +0100 |
| commit | e547c0031697a0cb5ff7f4a66754fb3e082754ff (patch) | |
| tree | 14d3702ad7f709806d4f3c7e43bf1c6fb720662d /drivers/of/overlay.c | |
| parent | of: convert unittest overlay devicetree source to sugar syntax (diff) | |
| download | linux-e547c0031697a0cb5ff7f4a66754fb3e082754ff.tar.xz linux-e547c0031697a0cb5ff7f4a66754fb3e082754ff.zip | |
of: improve reporting invalid overlay target path
Errors while developing the patch to create of_overlay_fdt_apply()
exposed inadequate error messages to debug problems when overlay
devicetree fragment nodes contain an invalid target path. Improve
the messages in find_target_node() to remedy this.
Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Diffstat (limited to 'drivers/of/overlay.c')
| -rw-r--r-- | drivers/of/overlay.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index e3d7f69a8333..b930e05d1215 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -488,20 +488,30 @@ static int build_changeset(struct overlay_changeset *ovcs) */ static struct device_node *find_target_node(struct device_node *info_node) { + struct device_node *node; const char *path; u32 val; int ret; ret = of_property_read_u32(info_node, "target", &val); - if (!ret) - return of_find_node_by_phandle(val); + if (!ret) { + node = of_find_node_by_phandle(val); + if (!node) + pr_err("find target, node: %pOF, phandle 0x%x not found\n", + info_node, val); + return node; + } ret = of_property_read_string(info_node, "target-path", &path); - if (!ret) - return of_find_node_by_path(path); + if (!ret) { + node = of_find_node_by_path(path); + if (!node) + pr_err("find target, node: %pOF, path '%s' not found\n", + info_node, path); + return node; + } - pr_err("Failed to find target for node %p (%s)\n", - info_node, info_node->name); + pr_err("find target, node: %pOF, no target property\n", info_node); return NULL; } |