From mboxrd@z Thu Jan 1 00:00:00 1970 From: frowand.list@gmail.com Subject: [PATCH v4 4/4] of: improve reporting invalid overlay target path Date: Thu, 1 Mar 2018 10:00:56 -0800 Message-ID: <1519927256-4868-5-git-send-email-frowand.list@gmail.com> References: <1519927256-4868-1-git-send-email-frowand.list@gmail.com> Return-path: In-Reply-To: <1519927256-4868-1-git-send-email-frowand.list@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Rob Herring , pantelis.antoniou@konsulko.com, Pantelis Antoniou Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, geert@linux-m68k.org, laurent.pinchart+renesas@ideasonboard.com List-Id: devicetree@vger.kernel.org From: Frank Rowand 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 --- changes from v2: - add fragment node name as suggested by Geert - existing error message printed short node name, thus not discriminating between fragments; change to full node name - existing error message printed node address, which is devicetree internal debugging, not useful in an overlay apply error message; remove node address from message drivers/of/overlay.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 5f6c5569e97d..852e566d7744 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; } -- Frank Rowand