From patchwork Tue Jan 24 17:45:34 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: 92385 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1829833qgi; Tue, 24 Jan 2017 09:45:43 -0800 (PST) X-Received: by 10.99.39.71 with SMTP id n68mr41172243pgn.85.1485279943087; Tue, 24 Jan 2017 09:45:43 -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:43 -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 S1750806AbdAXRpm (ORCPT + 7 others); Tue, 24 Jan 2017 12:45:42 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:32945 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbdAXRpk (ORCPT ); Tue, 24 Jan 2017 12:45:40 -0500 Received: by mail-ot0-f193.google.com with SMTP id f9so20468015otd.0; Tue, 24 Jan 2017 09:45:40 -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=OdQ39pbYvpxkOhFOCaWmjxt22IcP3+SB72iK1KyLRSg=; b=VNd8gvtNKr0B4ins/p/2CO9I/iehn6UPXh0DAVqdRHpKXnDIXrHhh2VQ0Z7iaFFcCs CsUr1ewTvwBYg5rXQSCCLSKRrEvTK7iJKaHAdt0/WDuAcb31dblu/LN6pA4R56hvbUVk 4GWsir7rGFpJOqg5FpVKWVOWcXUbGQlY1ebFdXh9KSbHq1hhmoTcuRHAl/V4x7nW9R5T H8mv3TAWcBXDqpvBImgqZLpVGp/C3BgUVcHyBi+Y1ovr4qcGw24Jv8pjlkRtKM2aMmwC WjNLmOCEdr0Wrwyvjm/GYXKgjA+gR9PPKvdQGi/k/A3N9ZsAeGx38KvHnDqpCq0couhr Hndw== X-Gm-Message-State: AIkVDXJF86J0Z/HlKgn2qSmBIdG0gN/QoEtIuulIZ6zLnv7IlSP5AYhW1/RNVCZ/5yMRLQ== X-Received: by 10.157.36.161 with SMTP id z30mr18939757ota.208.1485279939462; Tue, 24 Jan 2017 09:45:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Jan 2017 09:45:38 -0800 (PST) From: Rob Herring To: David Gibson Cc: devicetree@vger.kernel.org, devicetree-compiler@vger.kernel.org Subject: [PATCH 5/5] checks: Add bus checks for PCI buses Date: Tue, 24 Jan 2017 11:45:34 -0600 Message-Id: <20170124174534.3865-6-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 Add PCI bridge and device node checks. We identify PCI bridges with 'device_type = "pci"' as only PCI bridges should set that property. For bridges, we do a secondary check that the bridge has a ranges property in cases of nodes incorrectly setting 'device_type = "pci"'. For devices, the primary check is the reg property and the unit address. Device unit addresses are in the form DD or DD,F where DD is the device 0-0x1f and F is the function 0-7. Signed-off-by: Rob Herring --- checks.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 5 deletions(-) -- 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 5ef63a6a4317..f5fcd625a19b 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 { \ @@ -587,7 +592,88 @@ static void fixup_path_references(struct check *c, struct dt_info *dti, } ERROR(path_references, fixup_path_references, NULL, &duplicate_node_names); +static bool is_pci_bridge(struct node *node) +{ + struct property *prop; + + prop = get_property(node, "device_type"); + if (!prop) + return false; + + if (strcmp(prop->val.val, "pci") == 0) + return true; + + return false; +} + +static void pci_check_bridge(struct check *c, struct dt_info *dti, struct node *node) +{ + struct property *prop; + + prop = get_property(node, "ranges"); + if (!prop) { + FAIL(c, "Node %s missing ranges for PCI bridge (or not a bridge)", + node->fullpath); + return; + } + + if (node_addr_cells(node) != 3) + FAIL(c, "Node %s incorrect #address-cells for PCI bridge", + node->fullpath); + if (node_size_cells(node) != 2) + FAIL(c, "Node %s incorrect #size-cells for PCI bridge", + node->fullpath); +} + +static void pci_check_device(struct check *c, struct dt_info *dti, struct node *node) +{ + struct property *prop; + const char *unitname = get_unitname(node); + char unit_addr[5]; + unsigned int dev, func, reg; + + prop = get_property(node, "reg"); + if (!prop) + return; + + reg = fdt32_to_cpu(*((cell_t *)prop->val.val)); + + dev = (reg & 0xf800) >> 11; + func = (reg & 0x700) >> 8; + + if (reg & 0xff000000) + FAIL(c, "Node %s PCI reg address is not configuration space", + node->fullpath); + + if (dev > 0x1f) + FAIL(c, "Node %s PCI device number out of range", + node->fullpath); + if (func > 7) + FAIL(c, "Node %s PCI function number out of range", + node->fullpath); + + if (func == 0) { + snprintf(unit_addr, sizeof(unit_addr), "%x", dev); + if (!strcmp(unitname, unit_addr)) + return; + } + + snprintf(unit_addr, sizeof(unit_addr), "%x,%x", dev, func); + if (!strcmp(unitname, unit_addr)) + return; + + FAIL(c, "Node %s PCI unit address format error, expected \"%s\"", + node->fullpath, unit_addr); +} + +struct bus_type pci_bus_type = { + .bridge_is_type = is_pci_bridge, + .check_bridge = pci_check_bridge, + .check_device = pci_check_device, +}; + struct bus_type *bus_types[] = { + &pci_bus_type, NULL }; @@ -664,11 +750,6 @@ static void fixup_addr_size_cells(struct check *c, struct dt_info *dti, WARNING(addr_size_cells, fixup_addr_size_cells, 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 dt_info *dti, struct node *node) {