From patchwork Mon Feb 12 08:51:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Rowand X-Patchwork-Id: 871926 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qD6JhATN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zfzzW5QXxz9t39 for ; Mon, 12 Feb 2018 19:56:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932967AbeBLIw5 (ORCPT ); Mon, 12 Feb 2018 03:52:57 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:40733 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933045AbeBLIwV (ORCPT ); Mon, 12 Feb 2018 03:52:21 -0500 Received: by mail-pg0-f68.google.com with SMTP id g2so7090255pgn.7; Mon, 12 Feb 2018 00:52:21 -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=q3mfhmqe47HZBUEBaIOZtMtLNJG7nfsbCNTU7aMsDQQ=; b=qD6JhATNzIgXoZOx57hPA0srvQ396pWLchZGycqt7ER0kUvJjz9/y8RnpeVTDmEEF3 er3lZMX+YjC0Jg7KfchJMFs2L1twaA7WAc7cJJ/aZ2r7+9Tk3s5Tb3MnnMRqP8xKI+aE m++wRgeL/q16FV62HPj+8qnoe2iDpBTvGscvVcduihFYTf4fInzhZqtrz+Z1OMKO0412 zAUpLaxPRQe4u+L/LJZDnYPAnCBVxVjrEWGf3xCYgHSKWb8nygh0kSfn/6Pq6uHtpQEg AFA/aUm3mV/cmPXF1PVPsI79LibM2Yb0KqimnDg0lUtGxLYja8BIPBcJFfkYYbCvis1G Z6/Q== 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=q3mfhmqe47HZBUEBaIOZtMtLNJG7nfsbCNTU7aMsDQQ=; b=tV2/snEFbIyWXYXJC7eR1BzIX/D8GKe/RtqRjOPXzxboN6/k/THzlvJ0MTFDUPAskW NW8ezjzD4eD53WDDr3Hs0NnPIoIIjhq8Q/Tww5gdbm92t2O+YMQrx4H+J1/F26jbEbgA WnQw/+7juqVYRx8dr/kuNmoLkLEIx+IclbIUJrCt8WF1K86dwzM4CGDv/4oqzqQLUS4W 7BO2/nQDZYyPbzqmOz2XvdXDVc8iVDFb6JSUN//OdDu57iVYhFOVCP83iUdMygvj33g9 jmfbsFuniowAb6yATmbY+7mRbvpN9Bkc0j/EmxXV79VekYCp1LSaQdlhzIu9cV9Sjn7Y qGPw== X-Gm-Message-State: APf1xPA4wKYtjNzx3LkV3OKHnhxbhjvBdHWFshMOL5A/z0lit41ONOBZ vJH5G1rO6dvgPJgodQp5hJc= X-Google-Smtp-Source: AH8x226wh13YSV1VD/vLQxg2QDhty3ytZAk9YBEA7Kv/q0IPcm2T0/BesqG8oBXPTvVXtywJeyTULQ== X-Received: by 10.101.80.7 with SMTP id f7mr9080079pgo.35.1518425541179; Mon, 12 Feb 2018 00:52:21 -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 p9sm21249651pgs.35.2018.02.12.00.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 00:52:20 -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 Subject: [PATCH v2 4/4] of: improve reporting invalid overlay target path Date: Mon, 12 Feb 2018 00:51:36 -0800 Message-Id: <1518425496-12159-5-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1518425496-12159-1-git-send-email-frowand.list@gmail.com> References: <1518425496-12159-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 v1: - split out from patch 1/2 drivers/of/overlay.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 5f6c5569e97d..01362e7e98e3 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -488,17 +488,26 @@ 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("target node find by phandle failed\n"); + 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("target node find by path failed\n"); + return node; + } pr_err("Failed to find target for node %p (%s)\n", info_node, info_node->name);