[RESEND,v2] riscv: cacheinfo: Use of_property_present() for non-boolean properties

Commit Message

Rob Herring (Arm) Dec. 31, 2024, 4:13 p.m. UTC

The use of of_property_read_bool() for non-boolean properties is
deprecated in favor of of_property_present() when testing for property
presence.

Reviewed-by: Clément Léger <[e-mail]>
Signed-off-by: Rob Herring (Arm) <[e-mail]>
---
 arch/riscv/kernel/cacheinfo.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Geert Uytterhoeven Jan. 14, 2025, 10:52 a.m. UTC | #1

Hi Rob,

Thanks for your patch!

On Tue, Dec 31, 2024 at 5:14 PM Rob Herring (Arm) <[e-mail]> wrote:
> The use of of_property_read_bool() for non-boolean properties is
> deprecated in favor of of_property_present() when testing for property
> presence.

Please add

    This gets rid of the following boot warnings:

        OF: /cpus/cpu@0: Read of boolean property 'i-cache-size' with a value.
        OF: /cpus/cpu@0: Read of boolean property 'd-cache-size' with a value.
        OF: /soc/cache-controller@13400000: Read of boolean property
'cache-size' with a value.

so the next person doesn't have to dive into the code to find this patch ;-)

> Reviewed-by: Clément Léger <[e-mail]>
> Signed-off-by: Rob Herring (Arm) <[e-mail]>

Reviewed-by: Geert Uytterhoeven <[e-mail]>
Tested-by: Geert Uytterhoeven <[e-mail]>

Gr{oetje,eeting}s,

                        Geert

Rob Herring (Arm) Jan. 14, 2025, 3:25 p.m. UTC | #2

On Tue, Jan 14, 2025 at 4:52 AM Geert Uytterhoeven <[e-mail]> wrote:
>
> Hi Rob,
>
> Thanks for your patch!
>
> On Tue, Dec 31, 2024 at 5:14 PM Rob Herring (Arm) <[e-mail]> wrote:
> > The use of of_property_read_bool() for non-boolean properties is
> > deprecated in favor of of_property_present() when testing for property
> > presence.
>
> Please add
>
>     This gets rid of the following boot warnings:
>
>         OF: /cpus/cpu@0: Read of boolean property 'i-cache-size' with a value.
>         OF: /cpus/cpu@0: Read of boolean property 'd-cache-size' with a value.
>         OF: /soc/cache-controller@13400000: Read of boolean property
> 'cache-size' with a value.
>
> so the next person doesn't have to dive into the code to find this patch ;-)

If this patch had been picked up in a timely manner, no one would have
ever seen that warning. I'll leave it to the riscv maintainers to add
that if they desire. That warning didn't exist when this patch was
written.

Rob

Patch

diff --git a/arch/riscv/kernel/cacheinfo.c b/arch/riscv/kernel/cacheinfo.c
index 2d40736fc37c..26b085dbdd07 100644
--- a/arch/riscv/kernel/cacheinfo.c
+++ b/arch/riscv/kernel/cacheinfo.c
@@ -108,11 +108,11 @@  int populate_cache_leaves(unsigned int cpu)
 	if (!np)
 		return -ENOENT;
 
-	if (of_property_read_bool(np, "cache-size"))
+	if (of_property_present(np, "cache-size"))
 		ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
-	if (of_property_read_bool(np, "i-cache-size"))
+	if (of_property_present(np, "i-cache-size"))
 		ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
-	if (of_property_read_bool(np, "d-cache-size"))
+	if (of_property_present(np, "d-cache-size"))
 		ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
 
 	prev = np;
@@ -125,11 +125,11 @@  int populate_cache_leaves(unsigned int cpu)
 			break;
 		if (level <= levels)
 			break;
-		if (of_property_read_bool(np, "cache-size"))
+		if (of_property_present(np, "cache-size"))
 			ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
-		if (of_property_read_bool(np, "i-cache-size"))
+		if (of_property_present(np, "i-cache-size"))
 			ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
-		if (of_property_read_bool(np, "d-cache-size"))
+		if (of_property_present(np, "d-cache-size"))
 			ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
 		levels = level;
 	}