Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753598Ab3IRUYG (ORCPT ); Wed, 18 Sep 2013 16:24:06 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:53041 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753548Ab3IRUYD (ORCPT ); Wed, 18 Sep 2013 16:24:03 -0400 From: Stephen Warren To: Jon Loeliger , David Gibson Cc: Olof Johansson , frowand.list@gmail.com, Tomasz Figa , Benjamin Herrenschmidt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Marek Szyprowski , Rob Herring , Grant Likely , Stephen Warren Subject: [dtc RFC PATCH] Enforce node name unit-address presence/absence Date: Wed, 18 Sep 2013 14:23:56 -0600 Message-Id: <1379535836-12726-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 X-NVConfidentiality: public Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2070 Lines: 63 From: Stephen Warren ePAPR 1.1 section 2.2.1.1 "Node Name Requirements" specifies that any node that has a reg property must include a unit address in its name with value matching the first entry in its reg property. Conversely, if a node does not have a reg property, the node name must not include a unit address. Implement a check for this. The code doesn't validate the format of the unit address; ePAPR implies this may vary from binding to binding, so I'm not sure that it's possible to validate the value itself. Signed-off-by: Stephen Warren --- This depends on my previous patch "Ensure all tests have matching reg and unit address". Note that this patch should not yet be applied; it will cause many real- world *.dts files to fail to compile. Those need to be fixed first. However, if/when that happens, this patch may be useful. --- checks.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/checks.c b/checks.c index ee96a25..c80a055 100644 --- a/checks.c +++ b/checks.c @@ -287,9 +287,25 @@ NODE_ERROR(node_name_chars, PROPNODECHARS "@"); static void check_node_name_format(struct check *c, struct node *dt, struct node *node) { - if (strchr(get_unitname(node), '@')) + const char *unitname; + struct property *prop; + + unitname = get_unitname(node); + + if (strchr(unitname, '@')) FAIL(c, "Node %s has multiple '@' characters in name", node->fullpath); + + prop = get_property(node, "reg"); + if (prop) { + if (!unitname[0]) + FAIL(c, "Node %s has a reg property, but no unit name", + node->fullpath); + } else { + if (unitname[0]) + FAIL(c, "Node %s has a unit name, but no reg property", + node->fullpath); + } } NODE_ERROR(node_name_format, NULL, &node_name_chars); -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/