From patchwork Fri Mar 2 01:52:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 880232 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BIQfRPY0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zsslS5HKLz9sW5 for ; Fri, 2 Mar 2018 12:53:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1164081AbeCBBwy (ORCPT ); Thu, 1 Mar 2018 20:52:54 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39225 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1164079AbeCBBww (ORCPT ); Thu, 1 Mar 2018 20:52:52 -0500 Received: by mail-pl0-f65.google.com with SMTP id s13-v6so4762661plq.6; Thu, 01 Mar 2018 17:52:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZrVYjpxRDi9XaDINPrew6XMKbAbethPCTJUpEDBKWs0=; b=BIQfRPY0HeVexDb8yT7XyuP/pR2YHerUzkZ97U911gVtJGj7HupSwjeMU+j/oD0H4w UfHquiADR1OzugdWe1QzfEp+qCpdfcfmi6RRKg+bQRfhL71dXAPan2ZGwmnIpgG6baSV VlahuBoYwFgIQD2tRGxW3516SWXPHh58gdcDZqYY4TYlPkQfrxJGGbj/GiT+GeKRpf9I VVYYz3/FdRWBQLB5/Utta7Uhi3tb+AKqO79f7q7IhLOAyB9m3oF4pc0hrg0VewJLCdny szoCCZfpk0v5dbcpR6UawpuiApgUO2WGO7dAs5DbTFvAWwYF1fNDqTtir9fFjm2crgpX 88KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZrVYjpxRDi9XaDINPrew6XMKbAbethPCTJUpEDBKWs0=; b=OMNQv7r6RBGKBC65n8N/37FNvNYAOQyX8CWDjPBb/1M6Io5Dw/WK/p/8HikhYqH2iw 2Z4AtcJwd/9MS+F/G1a8trT3xvF/jhgiORpoIndqfwekCjhscQqeskruiQ8SBk+Hm3kJ /ud0ZnOM6aWY2yGuWe2lXmjeCNpsOpwpKPzkwZZiv2JBkEiSmrScP4PZQycNtyjun4sm NC5cZ8T2XqKccVAeL/NZEjggxyXMpg8Pg339dkD1ZueOwDj32PmYKB9BYZFuvDIp7i1c JGncXwk4Ft7YuQfQugpBmlVMkay9GNZnakINtOD/d41Dz9XvkNKPqNU/kbqxvtSCSr/E uwyw== X-Gm-Message-State: APf1xPB7bLbFN95E+jRs8z2kl9z7I0GS4jmvsGGbYpc95GvMa382yNe8 EU5aZNEgePH+xdBiIgwouYQ= X-Google-Smtp-Source: AG47ELvMZTnxfGpohEmJfIP0tyEh2MhpWQExbR35c9tCZn2mQLiFC8k1Bd5F2M+dqljFNg77njlA3A== X-Received: by 2002:a17:902:5682:: with SMTP id j2-v6mr3679816pli.441.1519955571826; Thu, 01 Mar 2018 17:52:51 -0800 (PST) Received: from localhost.localdomain (c-73-93-215-6.hsd1.ca.comcast.net. [73.93.215.6]) by smtp.gmail.com with ESMTPSA id b88sm10550313pfd.108.2018.03.01.17.52.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Mar 2018 17:52:51 -0800 (PST) From: frowand.list@gmail.com 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 Subject: [PATCH v5 4/4] of: improve reporting invalid overlay target path Date: Thu, 1 Mar 2018 17:52:00 -0800 Message-Id: <1519955520-29975-5-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519955520-29975-1-git-send-email-frowand.list@gmail.com> References: <1519955520-29975-1-git-send-email-frowand.list@gmail.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: 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 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; }