[PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes

[PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes

[Masahiro Yamada]

This if_change_rule is not working; it cannot detect any command line
changes.

The reason is because cmd-check in scripts/Kbuild.include compares
$(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here.

For if_change_rule to work properly, the stem part of cmd_* and rule_*
must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must
be named rule_dtc.

Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/Makefile.lib | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index bae62549e3d2..64b938c10039 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -302,13 +302,13 @@ 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) $@ ;
 
-define rule_dtc_dt_yaml
+define rule_dtc
 	$(call cmd_and_fixdep,dtc,yaml)
 	$(call cmd,dtb_check)
 endef
 
 $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
-	$(call if_changed_rule,dtc_dt_yaml)
+	$(call if_changed_rule,dtc)
 
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 
-- 
2.17.1

[PATCH 2/5] kbuild: remove unneeded semicolon at the end of cmd_dtb_check

[Masahiro Yamada]

This trailing semicolon is unneeded.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/Makefile.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 64b938c10039..752ff0a225a9 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -300,7 +300,7 @@ DT_BINDING_DIR := Documentation/devicetree/bindings
 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) $@ ;
+      cmd_dtb_check =	$(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@
 
 define rule_dtc
 	$(call cmd_and_fixdep,dtc,yaml)
-- 
2.17.1

[PATCH 3/5] kbuild: add dtbs_check to PHONY

[Masahiro Yamada]

The dtbs_check should be a phony target, but currently it is not
specified so.

'make dtbs_check' works even if a file named 'dtbs_check' exists
because it depends on another phony target, scripts_dtc, but we
should not rely on it.

Add dtbs_check to PHONY.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aab38cb02b24..102710a9228c 100644
--- a/Makefile
+++ b/Makefile
@@ -1238,7 +1238,7 @@ ifneq ($(dtstree),)
 %.dtb: include/config/kernel.release scripts_dtc
 	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
 
-PHONY += dtbs dtbs_install dt_binding_check
+PHONY += dtbs dtbs_install dtbs_check dt_binding_check
 dtbs dtbs_check: include/config/kernel.release scripts_dtc
 	$(Q)$(MAKE) $(build)=$(dtstree)
 
-- 
2.17.1

[PATCH 4/5] kbuild: add dt_binding_check to PHONY in a correct place

[Masahiro Yamada]

The dt_binding_check is added to PHONY, but it is visible only
when $(dtstree) is not empty. So, it is not specified as phony
for ARCH=x86 etc.

Add it to PHONY outside the ifneq ... endif block.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 102710a9228c..83f9b8f6fbaf 100644
--- a/Makefile
+++ b/Makefile
@@ -1238,7 +1238,7 @@ ifneq ($(dtstree),)
 %.dtb: include/config/kernel.release scripts_dtc
 	$(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
 
-PHONY += dtbs dtbs_install dtbs_check dt_binding_check
+PHONY += dtbs dtbs_install dtbs_check
 dtbs dtbs_check: include/config/kernel.release scripts_dtc
 	$(Q)$(MAKE) $(build)=$(dtstree)
 
@@ -1258,6 +1258,7 @@ PHONY += scripts_dtc
 scripts_dtc: scripts_basic
 	$(Q)$(MAKE) $(build)=scripts/dtc
 
+PHONY += dt_binding_check
 dt_binding_check: scripts_dtc
 	$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
 
-- 
2.17.1

[PATCH 5/5] kbuild: allow to run dt_binding_check and dtbs_check in a single command

[Masahiro Yamada]

Since commit 93512dad334d ("dt-bindings: Improve validation build error
handling"), 'make dtbs_check' does not validate the schema fully.

If you want to check everything, you need to run two commands.

  $ make ARCH=arm dt_binding_check
  $ make ARCH=arm dtbs_check

You cannot do:

  $ make ARCH=arm dt_binding_check dtbs_check

Because CHECK_DTBS is set, dt-doc-validate and dt-extract-example
are skipped.

Making it work will be useful for schema writers.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Documentation/devicetree/bindings/Makefile  | 6 ++----
 Documentation/devicetree/writing-schema.rst | 4 ++++
 Makefile                                    | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
index 646cb3525373..6efa2094b95e 100644
--- a/Documentation/devicetree/bindings/Makefile
+++ b/Documentation/devicetree/bindings/Makefile
@@ -25,10 +25,8 @@ DT_DOCS = $(shell \
 
 DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(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))
-endif
+extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
+extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
 
 $(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE
 	$(call if_changed,mk_schema)
diff --git a/Documentation/devicetree/writing-schema.rst b/Documentation/devicetree/writing-schema.rst
index 7635ab230456..220cf464ed77 100644
--- a/Documentation/devicetree/writing-schema.rst
+++ b/Documentation/devicetree/writing-schema.rst
@@ -147,6 +147,10 @@ Note that ``dtbs_check`` will skip any binding schema files with errors. It is
 necessary to use ``dt_binding_check`` to get all the validation errors in the
 binding schema files.
 
+It is possible to run both in a single command::
+
+    make dt_binding_check dtbs_check
+
 It is also possible to run checks with a single schema file by setting the
 ``DT_SCHEMA_FILES`` variable to a specific schema file.
 
diff --git a/Makefile b/Makefile
index 83f9b8f6fbaf..59dd768a1c1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1243,7 +1243,7 @@ dtbs dtbs_check: include/config/kernel.release scripts_dtc
 	$(Q)$(MAKE) $(build)=$(dtstree)
 
 dtbs_check: export CHECK_DTBS=1
-dtbs_check: dt_binding_check
+dtbs_check: __dt_binding_check
 
 dtbs_install:
 	$(Q)$(MAKE) $(dtbinst)=$(dtstree)
@@ -1258,8 +1258,10 @@ PHONY += scripts_dtc
 scripts_dtc: scripts_basic
 	$(Q)$(MAKE) $(build)=scripts/dtc
 
-PHONY += dt_binding_check
-dt_binding_check: scripts_dtc
+PHONY += dt_binding_check __dt_binding_check
+dt_binding_check: export CHECK_DT_BINDING=y
+dt_binding_check: __dt_binding_check
+__dt_binding_check: scripts_dtc
 	$(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
 
 # ---------------------------------------------------------------------------
-- 
2.17.1

Re: [PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes

[Rob Herring]

On Sun, Feb 23, 2020 at 04:04:31AM +0900, Masahiro Yamada wrote:
> This if_change_rule is not working; it cannot detect any command line
> changes.
> 
> The reason is because cmd-check in scripts/Kbuild.include compares
> $(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here.
> 
> For if_change_rule to work properly, the stem part of cmd_* and rule_*
> must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must
> be named rule_dtc.
> 
> Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks")
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  scripts/Makefile.lib | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

For the series,

Acked-by: Rob Herring <robh@kernel.org>

I'm assuming you will take these? If not, I can in the DT tree.

Rob

Re: [PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes

[Masahiro Yamada]

Hi Rob,

On Tue, Feb 25, 2020 at 7:52 AM Rob Herring <robh@kernel.org> wrote:
>
> On Sun, Feb 23, 2020 at 04:04:31AM +0900, Masahiro Yamada wrote:
> > This if_change_rule is not working; it cannot detect any command line
> > changes.
> >
> > The reason is because cmd-check in scripts/Kbuild.include compares
> > $(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here.
> >
> > For if_change_rule to work properly, the stem part of cmd_* and rule_*
> > must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must
> > be named rule_dtc.
> >
> > Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks")
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
> >
> >  scripts/Makefile.lib | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
>
> For the series,
>
> Acked-by: Rob Herring <robh@kernel.org>
>
> I'm assuming you will take these? If not, I can in the DT tree.

Yes, I will queue these to kbuild tree.





-- 
Best Regards
Masahiro Yamada

Re: [PATCH 5/5] kbuild: allow to run dt_binding_check and dtbs_check in a single command

[Masahiro Yamada]

On Sun, Feb 23, 2020 at 4:04 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Since commit 93512dad334d ("dt-bindings: Improve validation build error
> handling"), 'make dtbs_check' does not validate the schema fully.
>
> If you want to check everything, you need to run two commands.
>
>   $ make ARCH=arm dt_binding_check
>   $ make ARCH=arm dtbs_check
>
> You cannot do:
>
>   $ make ARCH=arm dt_binding_check dtbs_check
>
> Because CHECK_DTBS is set, dt-doc-validate and dt-extract-example
> are skipped.
>
> Making it work will be useful for schema writers.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---



Sorry, I take back this patch.

'make dtbs_check dt_binding_chec' does not work.



>
>  Documentation/devicetree/bindings/Makefile  | 6 ++----
>  Documentation/devicetree/writing-schema.rst | 4 ++++
>  Makefile                                    | 8 +++++---
>  3 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
> index 646cb3525373..6efa2094b95e 100644
> --- a/Documentation/devicetree/bindings/Makefile
> +++ b/Documentation/devicetree/bindings/Makefile
> @@ -25,10 +25,8 @@ DT_DOCS = $(shell \
>
>  DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(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))
> -endif
> +extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
> +extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
>
>  $(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE
>         $(call if_changed,mk_schema)
> diff --git a/Documentation/devicetree/writing-schema.rst b/Documentation/devicetree/writing-schema.rst
> index 7635ab230456..220cf464ed77 100644
> --- a/Documentation/devicetree/writing-schema.rst
> +++ b/Documentation/devicetree/writing-schema.rst
> @@ -147,6 +147,10 @@ Note that ``dtbs_check`` will skip any binding schema files with errors. It is
>  necessary to use ``dt_binding_check`` to get all the validation errors in the
>  binding schema files.
>
> +It is possible to run both in a single command::
> +
> +    make dt_binding_check dtbs_check
> +
>  It is also possible to run checks with a single schema file by setting the
>  ``DT_SCHEMA_FILES`` variable to a specific schema file.
>
> diff --git a/Makefile b/Makefile
> index 83f9b8f6fbaf..59dd768a1c1e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1243,7 +1243,7 @@ dtbs dtbs_check: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree)
>
>  dtbs_check: export CHECK_DTBS=1
> -dtbs_check: dt_binding_check
> +dtbs_check: __dt_binding_check
>
>  dtbs_install:
>         $(Q)$(MAKE) $(dtbinst)=$(dtstree)
> @@ -1258,8 +1258,10 @@ PHONY += scripts_dtc
>  scripts_dtc: scripts_basic
>         $(Q)$(MAKE) $(build)=scripts/dtc
>
> -PHONY += dt_binding_check
> -dt_binding_check: scripts_dtc
> +PHONY += dt_binding_check __dt_binding_check
> +dt_binding_check: export CHECK_DT_BINDING=y
> +dt_binding_check: __dt_binding_check
> +__dt_binding_check: scripts_dtc
>         $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
>
>  # ---------------------------------------------------------------------------
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes

[Masahiro Yamada]

On Tue, Feb 25, 2020 at 1:32 PM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> Hi Rob,
>
> On Tue, Feb 25, 2020 at 7:52 AM Rob Herring <robh@kernel.org> wrote:
> >
> > On Sun, Feb 23, 2020 at 04:04:31AM +0900, Masahiro Yamada wrote:
> > > This if_change_rule is not working; it cannot detect any command line
> > > changes.
> > >
> > > The reason is because cmd-check in scripts/Kbuild.include compares
> > > $(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here.
> > >
> > > For if_change_rule to work properly, the stem part of cmd_* and rule_*
> > > must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must
> > > be named rule_dtc.
> > >
> > > Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks")
> > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > > ---
> > >
> > >  scripts/Makefile.lib | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > For the series,
> >
> > Acked-by: Rob Herring <robh@kernel.org>
> >
> > I'm assuming you will take these? If not, I can in the DT tree.
>
> Yes, I will queue these to kbuild tree.
>
>


Applied with Rob's Ack.




-- 
Best Regards
Masahiro Yamada

Re: [PATCH 2/5] kbuild: remove unneeded semicolon at the end of cmd_dtb_check

[Masahiro Yamada]

On Sun, Feb 23, 2020 at 4:04 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> This trailing semicolon is unneeded.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Applied with Rob's Ack.


>  scripts/Makefile.lib | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index 64b938c10039..752ff0a225a9 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -300,7 +300,7 @@ DT_BINDING_DIR := Documentation/devicetree/bindings
>  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) $@ ;
> +      cmd_dtb_check =  $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@
>
>  define rule_dtc
>         $(call cmd_and_fixdep,dtc,yaml)
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 3/5] kbuild: add dtbs_check to PHONY

[Masahiro Yamada]

On Sun, Feb 23, 2020 at 4:04 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The dtbs_check should be a phony target, but currently it is not
> specified so.
>
> 'make dtbs_check' works even if a file named 'dtbs_check' exists
> because it depends on another phony target, scripts_dtc, but we
> should not rely on it.
>
> Add dtbs_check to PHONY.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Applied with Rob's Ack.


>
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index aab38cb02b24..102710a9228c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1238,7 +1238,7 @@ ifneq ($(dtstree),)
>  %.dtb: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
>
> -PHONY += dtbs dtbs_install dt_binding_check
> +PHONY += dtbs dtbs_install dtbs_check dt_binding_check
>  dtbs dtbs_check: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree)
>
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 4/5] kbuild: add dt_binding_check to PHONY in a correct place

[Masahiro Yamada]

On Sun, Feb 23, 2020 at 4:04 AM Masahiro Yamada <masahiroy@kernel.org> wrote:
>
> The dt_binding_check is added to PHONY, but it is visible only
> when $(dtstree) is not empty. So, it is not specified as phony
> for ARCH=x86 etc.
>
> Add it to PHONY outside the ifneq ... endif block.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---

Applied with Rob's Ack.



>  Makefile | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 102710a9228c..83f9b8f6fbaf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1238,7 +1238,7 @@ ifneq ($(dtstree),)
>  %.dtb: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@
>
> -PHONY += dtbs dtbs_install dtbs_check dt_binding_check
> +PHONY += dtbs dtbs_install dtbs_check
>  dtbs dtbs_check: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree)
>
> @@ -1258,6 +1258,7 @@ PHONY += scripts_dtc
>  scripts_dtc: scripts_basic
>         $(Q)$(MAKE) $(build)=scripts/dtc
>
> +PHONY += dt_binding_check
>  dt_binding_check: scripts_dtc
>         $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
>
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada