Skip to contentSkip to conversation

of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings

PATCH Superseded Rob Herring 3 participants 4 messages Oct 26, 2021 – Oct 28, 2021

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 of/unittest: Disable new dtc node_name_vs_property_name and interrupt_map warnings

The unittest dtbs have various intentional errors which cause warnings. With the latest dtc sync to v1.6.1-19-g0a3a9d3449c8, we need to disable some new checks: node_name_vs_property_name and interrupt_map warnings.

These warnings are also generated for static_base_1.dtb, so let's just disable the problematic warnings for all unittest dtbs instead of just testcases.dtb.

Fixes e76187b9792e ("scripts/dtc: Update to upstream version v1.6.1-19-g0a3a9d3449c8")
Cc Frank Rowand <[email protected]>
---
 drivers/of/unittest-data/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/of/unittest-data/Makefile +3 -1
index a5d2d9254b2c..7e1a25ad4e5c 100644
@@ -37,7 +37,9 @@ DTC_FLAGS_overlay_base += -@
 DTC_FLAGS_testcases += -@
 
 # suppress warnings about intentional errors
-DTC_FLAGS_testcases += -Wno-interrupts_property
+DTC_FLAGS += -Wno-interrupts_property \
+	-Wno-node_name_vs_property_name \
+	-Wno-interrupt_map
 
 # Apply overlays statically with fdtoverlay.  This is a build time test that
 # the overlays can be applied successfully by fdtoverlay.  This does not
Signature · 1 line
2.32.0
#1 lore raw
Quoted 22 lines · Rob Herring

The unittest dtbs have various intentional errors which cause warnings. With the latest dtc sync to v1.6.1-19-g0a3a9d3449c8, we need to disable some new checks: node_name_vs_property_name and interrupt_map warnings.

These warnings are also generated for static_base_1.dtb, so let's just disable the problematic warnings for all unittest dtbs instead of just testcases.dtb.

Fixes e76187b9792e ("scripts/dtc: Update to upstream version v1.6.1-19-g0a3a9d3449c8")
Cc Frank Rowand <[email protected]>
---
 drivers/of/unittest-data/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/of/unittest-data/Makefile +0 -0
index a5d2d9254b2c..7e1a25ad4e5c 100644

drivers/of/unittest-data/Makefile DTC_FLAGS_overlay_base += -@ · line 45

Quoted 10 lines
drivers/of/unittest-data/Makefile +3 -1
@@ -37,7 +37,9 @@ DTC_FLAGS_overlay_base += -@
 DTC_FLAGS_testcases += -@
 
 # suppress warnings about intentional errors
-DTC_FLAGS_testcases += -Wno-interrupts_property
+DTC_FLAGS += -Wno-interrupts_property \
+	-Wno-node_name_vs_property_name \
+	-Wno-interrupt_map
 
 # Apply overlays statically with fdtoverlay.  This is a build time test that
 # the overlays can be applied successfully by fdtoverlay.  This does not

Before applying this commit, I am not seeing the warning that -Wno-interrupt_map suppresses. I've tried with (1) CONFIG_OF_DYNAMIC and (2) with both CONFIG_OF_DYNAMIC and CONFIG_OF_OVERLAY, and I don't see the warning.

Where are you seeing the interrupt_map warning?

I would prefer not changing from DTC_FLAGS_testcases to DTC_FLAGS because the suppresses the warning for all unittest .dts files, not just the two that lead to the node_name_vs_property_name warning. These two cases can be covered with DTC_FLAGS_testcases and DTC_FLAGS_static_test_1.

-Frank

#2 lore raw

Hi Frank,

Quoted 6 lines · On Wed, 27 Oct 2021 19:05:22 -0500 Frank Rowand <[email protected]> wrote:

Before applying this commit, I am not seeing the warning that -Wno-interrupt_map suppresses. I've tried with (1) CONFIG_OF_DYNAMIC and (2) with both CONFIG_OF_DYNAMIC and CONFIG_OF_OVERLAY, and I don't see the warning.

Where are you seeing the interrupt_map warning?

Original report here:

https://lore.kernel.org/all/[email protected]/

Signature · 2 lines
Cheers,
Stephen Rothwell
author maintainer
#3 lore raw
In reply to Frank Rowand
Quoted 39 lines · Frank Rowand
Quoted 22 lines · Rob Herring

The unittest dtbs have various intentional errors which cause warnings. With the latest dtc sync to v1.6.1-19-g0a3a9d3449c8, we need to disable some new checks: node_name_vs_property_name and interrupt_map warnings.

These warnings are also generated for static_base_1.dtb, so let's just disable the problematic warnings for all unittest dtbs instead of just testcases.dtb.

Fixes e76187b9792e ("scripts/dtc: Update to upstream version v1.6.1-19-g0a3a9d3449c8")
Cc Frank Rowand <[email protected]>
---
 drivers/of/unittest-data/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/of/unittest-data/Makefile +0 -0
index a5d2d9254b2c..7e1a25ad4e5c 100644

drivers/of/unittest-data/Makefile DTC_FLAGS_overlay_base += -@ · line 45

Quoted 10 lines
drivers/of/unittest-data/Makefile +3 -1
@@ -37,7 +37,9 @@ DTC_FLAGS_overlay_base += -@
 DTC_FLAGS_testcases += -@
 
 # suppress warnings about intentional errors
-DTC_FLAGS_testcases += -Wno-interrupts_property
+DTC_FLAGS += -Wno-interrupts_property \
+     -Wno-node_name_vs_property_name \
+     -Wno-interrupt_map
 
 # Apply overlays statically with fdtoverlay.  This is a build time test that
 # the overlays can be applied successfully by fdtoverlay.  This does not

Before applying this commit, I am not seeing the warning that -Wno-interrupt_map suppresses. I've tried with (1) CONFIG_OF_DYNAMIC and (2) with both CONFIG_OF_DYNAMIC and CONFIG_OF_OVERLAY, and I don't see the warning.

Quoted 1 line

Where are you seeing the interrupt_map warning?

I should have noted that that is dependent on re-enabling the interrupt_provider warning which was dependent on the dtc changes. I've already submitted dts fixes for that and plan to enable soon:

scripts/Makefile.lib +1 -3
index 56d50eb0cd80..d435db2222ab 100644
@@ -305,7 +305,6 @@ quiet_cmd_gzip = GZIP    $@
 # DTC
 # ---------------------------------------------------------------------------
 DTC ?= $(objtree)/scripts/dtc/dtc
-DTC_FLAGS += -Wno-interrupt_provider
 
 # Disable noisy checks by default
 ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),)
@@ -319,8 +318,7 @@ endif
 
 ifneq ($(findstring 2,$(KBUILD_EXTRA_WARN)),)
 DTC_FLAGS += -Wnode_name_chars_strict \
-       -Wproperty_name_chars_strict \
-       -Winterrupt_provider
+       -Wproperty_name_chars_strict
 endif
 
 DTC_FLAGS += $(DTC_FLAGS_$(basetarget))

(I just noticed that dtc doesn't seem to handle overriding options such as: '-Wno-interrupt_provider -Winterrupt_provider')

Quoted 4 lines

I would prefer not changing from DTC_FLAGS_testcases to DTC_FLAGS because the suppresses the warning for all unittest .dts files, not just the two that lead to the node_name_vs_property_name warning. These two cases can be covered with DTC_FLAGS_testcases and DTC_FLAGS_static_test_1.

Okay.

Rob