From patchwork Thu Mar 24 00:40:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 64284 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp347080lbc; Wed, 23 Mar 2016 17:41:01 -0700 (PDT) X-Received: by 10.98.67.67 with SMTP id q64mr8509171pfa.44.1458780060928; Wed, 23 Mar 2016 17:41:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qx12si7793466pab.169.2016.03.23.17.41.00; Wed, 23 Mar 2016 17:41:00 -0700 (PDT) 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 S1753900AbcCXAk7 (ORCPT + 7 others); Wed, 23 Mar 2016 20:40:59 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:32914 "EHLO mail-ob0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753736AbcCXAk6 (ORCPT ); Wed, 23 Mar 2016 20:40:58 -0400 Received: by mail-ob0-f172.google.com with SMTP id xj3so26393019obb.0; Wed, 23 Mar 2016 17:40:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FTJ5AS+yvLtBTV3kxw2tgLafn0FDF2FEaqjhEqxFcKo=; b=cG9JXefDEzVNNhlB+qPWuHY8T+W+N1T+4tcl+eGUPnp10CUjVckyrW7hyvJGPb800h O2bz2OL5xQ7zvUwXdmdPXu4rbL6SQc6CsQ1GZqGa/lmrk0IPURDNvimKAl8A5MV8Nd2B UjLbj+xrJQmthT7RKcwgh1DAOvIkCB8xUpMvJgipUotnXOZZM35LRyT6MI8MRutFAxMV FHDc6R8VdlpKcem4QoL+SvtcAxqAYx/ohE32KM1O70OZAajDiS5WyWRKWZHZjNi/LUba UYUf9mzyHRjZz8Y1ue3voaN9g4wNtBGy3hqoEI6YB5zoGfOFXDgs5YuGB+C2eoklfZe0 HO5Q== X-Gm-Message-State: AD7BkJLYqJRPzBNwbuN8OklUd0wOIhMCpgNsgqp8KrtlRZWJbeoX+tePeGlHpdx2VEBq4w== X-Received: by 10.182.245.138 with SMTP id xo10mr3059701obc.56.1458780057433; Wed, 23 Mar 2016 17:40:57 -0700 (PDT) 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 c7sm1516559otb.24.2016.03.23.17.40.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2016 17:40:56 -0700 (PDT) From: Rob Herring To: David Gibson Cc: devicetree-compiler@vger.kernel.org, devicetree@vger.kernel.org Subject: [RFC 2/3] checks: Add unit-address checks for simple-bus and default Date: Wed, 23 Mar 2016 19:40:20 -0500 Message-Id: <1458780021-5052-2-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458780021-5052-1-git-send-email-robh@kernel.org> References: <1458780021-5052-1-git-send-email-robh@kernel.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Rob Herring --- checks.c | 87 +++++++++++++++++++++++++++-- tests/run_tests.sh | 4 ++ tests/unit-addr-leading-0s.dts | 10 ++++ tests/unit-addr-leading-0x.dts | 10 ++++ tests/unit-addr-simple-bus-comma.dts | 18 ++++++ tests/unit-addr-simple-bus-reg-mismatch.dts | 18 ++++++ 6 files changed, 142 insertions(+), 5 deletions(-) create mode 100644 tests/unit-addr-leading-0s.dts create mode 100644 tests/unit-addr-leading-0x.dts create mode 100644 tests/unit-addr-simple-bus-comma.dts create mode 100644 tests/unit-addr-simple-bus-reg-mismatch.dts -- 2.5.0 -- 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 48e926e..82a7f38 100644 --- a/checks.c +++ b/checks.c @@ -20,6 +20,11 @@ #include "dtc.h" +#define node_addr_cells(n) \ + (((n)->addr_cells == -1) ? 2 : (n)->addr_cells) +#define node_size_cells(n) \ + (((n)->size_cells == -1) ? 1 : (n)->size_cells) + #ifdef TRACE_CHECKS #define TRACE(c, ...) \ do { \ @@ -578,12 +583,88 @@ static bool is_simple_bridge(struct node *node) return false; } +static void default_unit_addr(struct check *c, struct node *dt, struct node *node) +{ + const char *unitname = get_unitname(node); + + if (strstr(unitname, "0x") == unitname) { + FAIL(c, "Node %s unit address 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 address should not have leading 0s", + node->fullpath); +} + +static void simple_bus_unit_addr(struct check *c, struct node *dt, struct node *node) +{ + const char *unitname = get_unitname(node); + struct property *prop; + uint64_t unitaddr, regaddr = 0; + int n, addr_cells; + cell_t *cell; + + default_unit_addr(c, dt, node); + + n = strspn(unitname, DIGITS "abcedf"); + if (n != strlen(unitname)) + FAIL(c, "Node %s unit address should have only lower case hex digits", + node->fullpath); + + unitaddr = strtoll(unitname, NULL, 16); + + prop = get_property(node, "reg"); + if (!prop) { + prop = get_property(node, "ranges"); + if (!prop || !prop->val.len) + return; + + cell = (cell_t *)prop->val.val; + cell += node_addr_cells(node); + } else + cell = (cell_t *)prop->val.val; + + addr_cells = node_addr_cells(node->parent); + while (addr_cells--) + regaddr = (regaddr << 32) | fdt32_to_cpu(*cell++); + + if (regaddr != unitaddr) + FAIL(c, "Node %s unit address does not match reg address (%zx != %zx)", + node->fullpath, regaddr, unitaddr); +} + struct bus_type simple_bus_type = { .expected_addr_cells = -1, /* For don't care */ .expected_size_cells = -1, .is_type = is_simple_bridge, + .check_unit_addr = simple_bus_unit_addr, +}; + +struct bus_type default_bus_type = { + .expected_addr_cells = -1, /* For don't care */ + .expected_size_cells = -1, + .check_unit_addr = default_unit_addr, }; +static void check_unit_address_format(struct check *c, struct node *dt, + struct node *node) +{ + struct bus_type *bt; + + if (!node->parent) + return; + + bt = node->parent->bus_type; + if (!bt) + bt = &default_bus_type; + + if (bt->check_unit_addr) + bt->check_unit_addr(c, dt, node); +} +NODE_WARNING(unit_address_format, NULL); + struct bus_type *bus_types[] = { &pci_bus_type, &simple_bus_type, @@ -635,11 +716,6 @@ static void fixup_addr_size_cells(struct check *c, struct node *dt, WARNING(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL, &address_cells_is_cell, &size_cells_is_cell); -#define node_addr_cells(n) \ - (((n)->addr_cells == -1) ? 2 : (n)->addr_cells) -#define node_size_cells(n) \ - (((n)->size_cells == -1) ? 1 : (n)->size_cells) - static void check_reg_format(struct check *c, struct node *dt, struct node *node) { @@ -771,6 +847,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 7eb9b3d..4adc704 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -447,6 +447,10 @@ 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 + check_tests unit-addr-simple-bus-comma.dts unit_address_format + check_tests unit-addr-simple-bus-reg-mismatch.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 0000000..7c8e2ce --- /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 0000000..7ed7254 --- /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>; + }; +}; diff --git a/tests/unit-addr-simple-bus-comma.dts b/tests/unit-addr-simple-bus-comma.dts new file mode 100644 index 0000000..ea6f769 --- /dev/null +++ b/tests/unit-addr-simple-bus-comma.dts @@ -0,0 +1,18 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + bus@10000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges = <0x0 0x10000000 0x10000>; + + node@0,1000 { + reg = <0x1000 1>; + }; + }; + +}; diff --git a/tests/unit-addr-simple-bus-reg-mismatch.dts b/tests/unit-addr-simple-bus-reg-mismatch.dts new file mode 100644 index 0000000..2823377 --- /dev/null +++ b/tests/unit-addr-simple-bus-reg-mismatch.dts @@ -0,0 +1,18 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + bus@10000000 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges = <0x0 0x10000000 0x10000>; + + node@100 { + reg = <0x1000 1>; + }; + }; + +};