From patchwork Fri Feb 10 16:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 93797 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp590756qgi; Fri, 10 Feb 2017 08:48:54 -0800 (PST) X-Received: by 10.84.254.66 with SMTP id a2mr6035262pln.57.1486745334023; Fri, 10 Feb 2017 08:48:54 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l187si2137519pfl.162.2017.02.10.08.48.53; Fri, 10 Feb 2017 08:48:54 -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 S1753443AbdBJQsG (ORCPT + 7 others); Fri, 10 Feb 2017 11:48:06 -0500 Received: from mail-ot0-f196.google.com ([74.125.82.196]:33481 "EHLO mail-ot0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbdBJQsE (ORCPT ); Fri, 10 Feb 2017 11:48:04 -0500 Received: by mail-ot0-f196.google.com with SMTP id f9so4382658otd.0; Fri, 10 Feb 2017 08:47:22 -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=e/fIcmKGToVxMY4fbUwpeBxnG4lWgmP/NjitnenpaxU=; b=n/jDqqDunLFDs392NUujEUsqHFmNL/f35bAQadK/VIM+9mD3X7GfvcCfjj5xiRptca rNXbdDxipMqibkggBQSI+SsIf4dXg/3+DIRXvs0O3jHQWshjQr/OgkeVMxWRXc0h4iKr mh6AeaUqttP85yzto28tfMEnltxpFl4tS6F05Rs7SE4ZZwuxRA/1EAQMxWhMyfta6E3E EeR5okLAHfJrpWRC+TxaKkj3r3+MVykAYJ/22WPxTKTFO/0x/sxXf2n4QuG3481JNw+n Zezrt5i04OKW7V2lOfDIhB5r9D1BPvLibA/qAeNZEcWFXblECVW1eEpmxI8EIHNsi1zM dKXA== X-Gm-Message-State: AMke39ljW596hvRKOmHsIzI+sP34evUyHggY7/4rWTTwVKmvy0j9/tmWx+2V4eQusK9NgA== X-Received: by 10.157.7.53 with SMTP id 50mr4883630ote.91.1486745242331; Fri, 10 Feb 2017 08:47:22 -0800 (PST) Received: from rob-hp-laptop.herring.priv (66-90-148-125.dyn.grandenetworks.net. [66.90.148.125]) by smtp.googlemail.com with ESMTPSA id r41sm1141714otc.40.2017.02.10.08.47.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2017 08:47:21 -0800 (PST) From: Rob Herring To: David Gibson Cc: devicetree@vger.kernel.org, devicetree-compiler@vger.kernel.org Subject: [PATCH v2 3/4] checks: Warn on node name unit-addresses with '0x' or leading 0s Date: Fri, 10 Feb 2017 10:47:16 -0600 Message-Id: <20170210164717.1234-4-robh@kernel.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20170210164717.1234-1-robh@kernel.org> References: <20170210164717.1234-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 --- v2: - Split into separate check from unit_address_vs_reg checks.c | 21 +++++++++++++++++++++ tests/run_tests.sh | 2 ++ tests/unit-addr-leading-0s.dts | 10 ++++++++++ tests/unit-addr-leading-0x.dts | 10 ++++++++++ 4 files changed, 43 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 67237ffe594e..16d17d20caec 100644 --- a/checks.c +++ b/checks.c @@ -296,6 +296,26 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti, } WARNING(unit_address_vs_reg, check_unit_address_vs_reg, NULL); +static void check_unit_address_format(struct check *c, struct dt_info *dti, + struct node *node) +{ + const char *unitname = get_unitname(node); + + if (!unitname[0]) + return; + + 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); +} +WARNING(unit_address_format, check_unit_address_format, NULL, &node_name_format); + static void check_property_name_chars(struct check *c, struct dt_info *dti, struct node *node) { @@ -753,6 +773,7 @@ static struct check *check_table[] = { &addr_size_cells, ®_format, &ranges_format, &unit_address_vs_reg, + &unit_address_format, &avoid_default_addr_size, &obsolete_chosen_interrupt_controller, diff --git a/tests/run_tests.sh b/tests/run_tests.sh index ed489dbdd269..0f5c3db79b80 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -540,6 +540,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_format + check_tests unit-addr-leading-0s.dts unit_address_format 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>; + }; +};