Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp4640649imm; Mon, 15 Oct 2018 19:41:05 -0700 (PDT) X-Google-Smtp-Source: ACcGV60IxnRA+0pH0mWSvgtxObnEbam8mhSQPb5KjCVDutzZEKRYFueXLPwcwd1J0WCJ8Vw+wJfg X-Received: by 2002:a17:902:7d94:: with SMTP id a20-v6mr17964126plm.40.1539657665809; Mon, 15 Oct 2018 19:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539657665; cv=none; d=google.com; s=arc-20160816; b=u0eg1THkK0YbCrqVJP69M9K1WOQtdS84ya15DS04//TzUz8gQUde9hrn9YX08rlNDz i734MJYWpfnlwgVgv/JxpmL3q0IEeGjUg/zeUTXm9k0H2R0MPDOeIBg/TR1zBAVFBCV7 GHAMVos5l6gdhYBfP8zoN3lhpmgLWSFET+eI4hi6GHYGCe8KlwC7ZXWT4pRUFW9Z0wjb isOwW65P6zt4VNCoyWnzqlD7+RqU2FCu9kplkitO9DLn30K6MQI6mgdgfiQK4KzfQ9wA ht940mBp1rdg+AlHhMB6GG0vmpvZhBVpma+L835omZ8r3ldoVuASHbxpfvrud/jgRCk2 ga4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=1eIq+bpAJjW92EtiaqYATBx5CfeVYNbB6/35CF3TsEg=; b=ELcrUfBroDGOM28IXw1TIuqDG9+jICJsjenmfEh8+e4aY24c6yXI2NiLhN5NRV8BMb +pljjX8tIM8+AnvCf9QMmzKz5a773zevu+QGH+W0hFIACsxPgJb/5lNUZQFtu8Z9Ggbr 6LiQFqZOLqb1FGjctHm+3h4XT0FeceDhPV47XbhkQQias1axGweSgxJ8m7KK4NNDIkSR VPMF/t0DKA4PIoEHxOMsb/MgPfK3xJDe47X9la22Zg9daxLHHhDAw+m+40XI1Dg50iTB MoDfXPZtcOjzvcxz5YJoRgh+GB0YHu9FrIPrPcFWkcyv2kXUDQU69wSrlHAjpP1e5lPX J6cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MMXCyx5M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p14-v6si11839033plo.363.2018.10.15.19.40.50; Mon, 15 Oct 2018 19:41:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=MMXCyx5M; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727214AbeJPK1a (ORCPT + 99 others); Tue, 16 Oct 2018 06:27:30 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:35709 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727169AbeJPK13 (ORCPT ); Tue, 16 Oct 2018 06:27:29 -0400 Received: by mail-pf1-f193.google.com with SMTP id l17-v6so10655516pff.2; Mon, 15 Oct 2018 19:39:25 -0700 (PDT) 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=1eIq+bpAJjW92EtiaqYATBx5CfeVYNbB6/35CF3TsEg=; b=MMXCyx5MOpk3tTtohq2TNbmnZ6+COnYfpVIPbLJKeruVi0HnjEGfAU9xSUQKWwjG17 HchDNMJhcV8Rvm+ITZdTDZDNbl+sbzurwnN+XRrqygSQskIc1n8/7e0VoSTQdAKDP8vP NDpum6aBLHer0xcp3RvYJXqr3MWxq7yAr4kOULKWgf4PQHNfDUUlGr2IN2hoo3tyqfJ6 5p5xbuVU8jm0JRvqvscaYx0vnhwWLRq8+QhDupF6V/l0mpBTF9+rcPW9g0YSDt5gJFow WCT5xOrzUGOPYLOQbXZJviWv6mpQIQj6Dhf/67WjWw8tIUdU5gGFLS2W0r5LvYCjLW7y FOBw== 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=1eIq+bpAJjW92EtiaqYATBx5CfeVYNbB6/35CF3TsEg=; b=aYlFFzap2mYfrTpEQ+QaRqQWvvskOa55YgIWiOvPkPJlj33uI/a3EuNepHd0vJQ2oO D465xr4mW1h1jPJTm5Ao5pjPhjXWcrKP1y+p7JEPkXNW3AR4drtjobQx94Bkmu4E7Nb2 l3y9Wyr6xPlefqKxpXIC2SSTpthdmgEEJ2FVBUnlnpGSYYJw2sk61kGpJTO7ABGRGWKf 1thNMLpy+AxTLhHeBNVeDpJw8sM/9+FB3XQV4PAwqzgRScChRoR+XrYmJAP9RL9Zc7Wd nW2vRLtHqd5W6qewiIaslMjfkwTCEDbwFDvaNqcWFIsDmVSmwi/7TeKdIUmqqvnoi7Ml A9xg== X-Gm-Message-State: ABuFfojQQNdHmUfTOEYnYlNlI5mPUkMXYfh6Rn0hL0U0wotUY7ywiwBZ aL/2QMd8f8txxOIWdxFfPkQ= X-Received: by 2002:a62:be1a:: with SMTP id l26-v6mr20630475pff.204.1539657565041; Mon, 15 Oct 2018 19:39:25 -0700 (PDT) Received: from localhost.localdomain (c-24-6-192-50.hsd1.ca.comcast.net. [24.6.192.50]) by smtp.gmail.com with ESMTPSA id u79-v6sm18620287pfd.117.2018.10.15.19.39.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 19:39:24 -0700 (PDT) From: frowand.list@gmail.com To: Rob Herring , Pantelis Antoniou , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Alan Tull , Moritz Fischer Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, devicetree@vger.kernel.org, linux-fpga@vger.kernel.org Subject: [PATCH v4 11/18] of: overlay: test case of two fragments adding same node Date: Mon, 15 Oct 2018 19:37:31 -0700 Message-Id: <1539657458-24401-12-git-send-email-frowand.list@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1539657458-24401-1-git-send-email-frowand.list@gmail.com> References: <1539657458-24401-1-git-send-email-frowand.list@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frank Rowand Multiple overlay fragments adding or deleting the same node is not supported. An attempt to do so results in an incorrect devicetree. The node name will be munged for the second add. After adding this patch, the unittest messages will show: Duplicate name in motor-1, renamed to "controller#1" OF: overlay: of_overlay_apply() err=0 ### dt-test ### of_overlay_fdt_apply() expected -22, ret=0, overlay_bad_add_dup_node ### dt-test ### FAIL of_unittest_overlay_high_level():2419 Adding overlay 'overlay_bad_add_dup_node' failed ... ### dt-test ### end of unittest - 210 passed, 1 failed The incorrect (munged) node name "controller#1" can be seen in the /proc filesystem: $ pwd /proc/device-tree/testcase-data-2/substation@100/motor-1 $ ls compatible controller controller#1 name phandle spin $ ls controller power_bus $ ls controller#1 power_bus_emergency Signed-off-by: Frank Rowand --- drivers/of/unittest-data/Makefile | 1 + .../of/unittest-data/overlay_bad_add_dup_node.dts | 28 ++++++++++++++++++++++ drivers/of/unittest.c | 5 ++++ 3 files changed, 34 insertions(+) create mode 100644 drivers/of/unittest-data/overlay_bad_add_dup_node.dts diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile index 013d85e694c6..166dbdbfd1c5 100644 --- a/drivers/of/unittest-data/Makefile +++ b/drivers/of/unittest-data/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_OF_OVERLAY) += overlay.dtb.o \ overlay_12.dtb.o \ overlay_13.dtb.o \ overlay_15.dtb.o \ + overlay_bad_add_dup_node.dtb.o \ overlay_bad_phandle.dtb.o \ overlay_bad_symbol.dtb.o \ overlay_base.dtb.o diff --git a/drivers/of/unittest-data/overlay_bad_add_dup_node.dts b/drivers/of/unittest-data/overlay_bad_add_dup_node.dts new file mode 100644 index 000000000000..145dfc3b1024 --- /dev/null +++ b/drivers/of/unittest-data/overlay_bad_add_dup_node.dts @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +/* + * &electric_1/motor-1 and &spin_ctrl_1 are the same node: + * /testcase-data-2/substation@100/motor-1 + * + * Thus the new node "controller" in each fragment will + * result in an attempt to add the same node twice. + * This will result in an error and the overlay apply + * will fail. + */ + +&electric_1 { + + motor-1 { + controller { + power_bus = < 0x1 0x2 >; + }; + }; +}; + +&spin_ctrl_1 { + controller { + power_bus_emergency = < 0x101 0x102 >; + }; +}; diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 722537e14848..471b8eb6e842 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -2147,6 +2147,7 @@ struct overlay_info { OVERLAY_INFO_EXTERN(overlay_12); OVERLAY_INFO_EXTERN(overlay_13); OVERLAY_INFO_EXTERN(overlay_15); +OVERLAY_INFO_EXTERN(overlay_bad_add_dup_node); OVERLAY_INFO_EXTERN(overlay_bad_phandle); OVERLAY_INFO_EXTERN(overlay_bad_symbol); @@ -2169,6 +2170,7 @@ struct overlay_info { OVERLAY_INFO(overlay_12, 0), OVERLAY_INFO(overlay_13, 0), OVERLAY_INFO(overlay_15, 0), + OVERLAY_INFO(overlay_bad_add_dup_node, -EINVAL), OVERLAY_INFO(overlay_bad_phandle, -EINVAL), OVERLAY_INFO(overlay_bad_symbol, -EINVAL), {} @@ -2413,6 +2415,9 @@ static __init void of_unittest_overlay_high_level(void) unittest(overlay_data_apply("overlay", NULL), "Adding overlay 'overlay' failed\n"); + unittest(overlay_data_apply("overlay_bad_add_dup_node", NULL), + "Adding overlay 'overlay_bad_add_dup_node' failed\n"); + unittest(overlay_data_apply("overlay_bad_phandle", NULL), "Adding overlay 'overlay_bad_phandle' failed\n"); -- Frank Rowand