From patchwork Tue Jan 24 17:45:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 92383 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1829826qgi; Tue, 24 Jan 2017 09:45:42 -0800 (PST) X-Received: by 10.98.196.1 with SMTP id y1mr41092698pff.105.1485279942422; Tue, 24 Jan 2017 09:45:42 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u5si19984577pgh.266.2017.01.24.09.45.42; Tue, 24 Jan 2017 09:45:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750738AbdAXRpk (ORCPT + 7 others); Tue, 24 Jan 2017 12:45:40 -0500 Received: from mail-ot0-f194.google.com ([74.125.82.194]:34194 "EHLO mail-ot0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750765AbdAXRpi (ORCPT ); Tue, 24 Jan 2017 12:45:38 -0500 Received: by mail-ot0-f194.google.com with SMTP id 73so20434084otj.1; Tue, 24 Jan 2017 09:45:38 -0800 (PST) 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=25m8LFwFXHOdlTy6lVMmOJXGaxlbxzJwfdegQ9vp3Pw=; b=aF3olemQi9b9hKSpw56sN5fiS4xHauXfQ00RHRgOK345Y+WEjcXOyd5Bple/k928Pv uo9GY6/RUHEceZ239AmZ+HQxpoAzTGPbWcwkFRk7jMshMJLcbcDeZYFdbzaCDK3elcp1 Y6TTWwkfkiPkV0yPVu80XErbFaIMTAvnEpdY1u3+q+jzHpnN4FqqG49sXJXncF2w8YAB 8TZ9L0U1N48YF79kpYghoNZ0h4wvvSQy1tepffrvOH+VP8rLJhYrCZpnQqs5vtlPJO3D rEBlRMmt1M1uaLv5SXwIemvNCUYkPTwz++5TAvgyBE7paZysYP/N1EthmgcFdwa+Tf1Z tQVA== X-Gm-Message-State: AIkVDXLqICsTA6ETjHpOfpH4pweEXHnWdQvVJ85v9megEb8VsFN98AD3ajPTjCwMKDD7Fg== X-Received: by 10.157.4.1 with SMTP id 1mr15286009otc.205.1485279937976; Tue, 24 Jan 2017 09:45:37 -0800 (PST) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id w84sm10736088oiw.21.2017.01.24.09.45.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 09:45:37 -0800 (PST) From: Rob Herring To: David Gibson Cc: devicetree@vger.kernel.org, devicetree-compiler@vger.kernel.org Subject: [PATCH 3/5] checks: Warn on node name unit-addresses with '0x' or leading 0s Date: Tue, 24 Jan 2017 11:45:32 -0600 Message-Id: <20170124174534.3865-4-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170124174534.3865-1-robh@kernel.org> References: <20170124174534.3865-1-robh@kernel.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Node name unit-addresses should never begin with 0x or leading 0s regardless of whether they have a bus specific address (i.e. one with commas) or not. Add warnings to check for these cases. Signed-off-by: Rob Herring --- checks.c | 10 ++++++++++ tests/run_tests.sh | 2 ++ tests/unit-addr-leading-0s.dts | 10 ++++++++++ tests/unit-addr-leading-0x.dts | 10 ++++++++++ 4 files changed, 32 insertions(+) create mode 100644 tests/unit-addr-leading-0s.dts create mode 100644 tests/unit-addr-leading-0x.dts -- 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/checks.c b/checks.c index 0c78d69316bc..8e310d69ca3d 100644 --- a/checks.c +++ b/checks.c @@ -288,6 +288,16 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti, if (!unitname[0]) FAIL(c, "Node %s has a reg or ranges property, but no unit name", node->fullpath); + + if (!strncmp(unitname, "0x", 2)) { + FAIL(c, "Node %s unit name should not have leading \"0x\"", + node->fullpath); + /* skip over 0x for next test */ + unitname += 2; + } + if (unitname[0] == '0' && isxdigit(unitname[1])) + FAIL(c, "Node %s unit name should not have leading 0s", + node->fullpath); } else { if (unitname[0]) FAIL(c, "Node %s has a unit name, but no reg property", diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 157dbaea7600..2c06666a9e23 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -539,6 +539,8 @@ dtc_tests () { check_tests obsolete-chosen-interrupt-controller.dts obsolete_chosen_interrupt_controller check_tests reg-without-unit-addr.dts unit_address_vs_reg check_tests unit-addr-without-reg.dts unit_address_vs_reg + check_tests unit-addr-leading-0x.dts unit_address_vs_reg + check_tests unit-addr-leading-0s.dts unit_address_vs_reg run_sh_test dtc-checkfails.sh node_name_chars -- -I dtb -O dtb bad_node_char.dtb run_sh_test dtc-checkfails.sh node_name_format -- -I dtb -O dtb bad_node_format.dtb run_sh_test dtc-checkfails.sh prop_name_chars -- -I dtb -O dtb bad_prop_char.dtb diff --git a/tests/unit-addr-leading-0s.dts b/tests/unit-addr-leading-0s.dts new file mode 100644 index 000000000000..7c8e2cebbc84 --- /dev/null +++ b/tests/unit-addr-leading-0s.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + node@001 { + reg = <1 0>; + }; +}; diff --git a/tests/unit-addr-leading-0x.dts b/tests/unit-addr-leading-0x.dts new file mode 100644 index 000000000000..7ed7254e8dc2 --- /dev/null +++ b/tests/unit-addr-leading-0x.dts @@ -0,0 +1,10 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + node@0x1 { + reg = <1 0>; + }; +};