From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C2EBC55181 for ; Tue, 21 Apr 2020 10:08:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 546BA22244 for ; Tue, 21 Apr 2020 10:08:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fMnCntoT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728162AbgDUKII (ORCPT ); Tue, 21 Apr 2020 06:08:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726018AbgDUKIH (ORCPT ); Tue, 21 Apr 2020 06:08:07 -0400 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CC8DC061A0F; Tue, 21 Apr 2020 03:08:07 -0700 (PDT) Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 51F4B528; Tue, 21 Apr 2020 12:08:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1587463683; bh=jZZNucahbB0cQG+f2xHIqkLJ13LcR9CX7G3M1Fg9Rgs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=fMnCntoTQdyFCITsBXIIgatU8psMgcwl/9xqO+hdIRpCQgKgkA6XNCiJJO8RpWvnp 4IR28sn9GueMuUq7E41/OJjVRWBhumhDbkMjufFlu/GZgSAqdFlBbzTyg1Psz038dH ipHNDn6ndT0LE7lFZTT6o5IyFZCf90KXGZIWG0dg= Date: Tue, 21 Apr 2020 13:07:49 +0300 From: Laurent Pinchart To: Rob Herring Cc: Masahiro Yamada , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Michal Marek , linux-kbuild@vger.kernel.org Subject: Re: [PATCH v2 1/2] kbuild: Always validate DT binding examples Message-ID: <20200421100749.GA5429@pendragon.ideasonboard.com> References: <20200229003731.2728-1-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200229003731.2728-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rob, On Fri, Feb 28, 2020 at 06:37:30PM -0600, Rob Herring wrote: > Most folks only run dt_binding_check on the single schema they care about > by setting DT_SCHEMA_FILES. That means example is only checked against > that one schema which is not always sufficient. > > Let's address this by splitting processed-schema.yaml into 2 files: one > that's always all schemas for the examples and one that's just the schema > in DT_SCHEMA_FILES for dtbs. This broke make DT_SCHEMA_FILES=Documentation/devicetree/.. dt_binding_check for me :-( make[1]: Entering directory '/home/laurent/src/linux/output/arm32' make[2]: execvp: /bin/sh: Argument list too long make[2]: *** [/home/laurent/src/linux/Documentation/devicetree/bindings/Makefile:35: Documentation/devicetree/bindings/processed-schema-examples.yaml] Error 127 make[1]: *** [/home/laurent/src/linux/Makefile:1296: dt_binding_check] Error 2 make[1]: Leaving directory '/home/laurent/src/linux/output/arm32' make: *** [Makefile:180: sub-make] Error 2 Before the patch, dt-mk-schema was called with DT_SCHEMA_FILES only, and it is now called with DT_DOCS unconditionally. > Cc: Michal Marek > Cc: linux-kbuild@vger.kernel.org > Co-developed-by: Masahiro Yamada > Signed-off-by: Rob Herring > --- > Masahiro, given you pretty much re-wrote this, I added you as > Co-developed-by. > > Based on next/master > > Documentation/devicetree/bindings/.gitignore | 2 +- > Documentation/devicetree/bindings/Makefile | 22 +++++++++++++------- > scripts/Makefile.lib | 3 ++- > 3 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/.gitignore b/Documentation/devicetree/bindings/.gitignore > index ef82fcfcccab..57afa1533a5f 100644 > --- a/Documentation/devicetree/bindings/.gitignore > +++ b/Documentation/devicetree/bindings/.gitignore > @@ -1,2 +1,2 @@ > *.example.dts > -processed-schema.yaml > +processed-schema*.yaml > diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile > index 646cb3525373..7c40d5ba1b51 100644 > --- a/Documentation/devicetree/bindings/Makefile > +++ b/Documentation/devicetree/bindings/Makefile > @@ -2,7 +2,6 @@ > DT_DOC_CHECKER ?= dt-doc-validate > DT_EXTRACT_EX ?= dt-extract-example > DT_MK_SCHEMA ?= dt-mk-schema > -DT_MK_SCHEMA_FLAGS := $(if $(DT_SCHEMA_FILES), -u) > > quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<) > cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \ > @@ -11,26 +10,33 @@ quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<) > $(obj)/%.example.dts: $(src)/%.yaml FORCE > $(call if_changed,chk_binding) > > -DT_TMP_SCHEMA := processed-schema.yaml > +# Use full schemas when checking %.example.dts > +DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml > > quiet_cmd_mk_schema = SCHEMA $@ > cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs) > > -DT_DOCS = $(shell \ > +DT_DOCS = $(addprefix $(src)/, \ > + $(shell \ > cd $(srctree)/$(src) && \ > find * \( -name '*.yaml' ! \ > - -name $(DT_TMP_SCHEMA) ! \ > + -name 'processed-schema*' ! \ > -name '*.example.dt.yaml' \) \ > - ) > + )) > > -DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS)) > +DT_SCHEMA_FILES ?= $(DT_DOCS) > > ifeq ($(CHECK_DTBS),) > extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES)) > extra-y += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES)) > +extra-y += processed-schema-examples.yaml > + > +$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE > + $(call if_changed,mk_schema) > endif > > -$(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE > +$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u > +$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE > $(call if_changed,mk_schema) > > -extra-y += $(DT_TMP_SCHEMA) > +extra-y += processed-schema.yaml > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index f5ff506e4a24..b12dd5ba4896 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -307,7 +307,8 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE > > DT_CHECKER ?= dt-validate > DT_BINDING_DIR := Documentation/devicetree/bindings > -DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml > +# DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile > +DT_TMP_SCHEMA ?= $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml > > quiet_cmd_dtb_check = CHECK $@ > cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ -- Regards, Laurent Pinchart