diff mbox series

[2/5] cacheinfo: Return error code in init_of_cache_level()

Message ID 20221108110424.166896-3-pierre.gondois@arm.com
State New
Headers
Series arch_topology: Build cacheinfo from primary CPU |

Commit Message

Pierre Gondois Nov. 8, 2022, 11:04 a.m. UTC 
  Make init_of_cache_level() return an error code when the cache
information parsing fails to help detecting missing information.

init_of_cache_level() is only called for riscv. Returning an error
code instead of 0 will prevent detect_cache_attributes() to allocate
memory if an incomplete DT is parsed.

Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
---
 drivers/base/cacheinfo.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Comments

Sudeep Holla Nov. 8, 2022, 4:05 p.m. UTC | #1 
On Tue, Nov 08, 2022 at 12:04:18PM +0100, Pierre Gondois wrote:
> Make init_of_cache_level() return an error code when the cache
> information parsing fails to help detecting missing information.
> 
> init_of_cache_level() is only called for riscv. Returning an error
> code instead of 0 will prevent detect_cache_attributes() to allocate
> memory if an incomplete DT is parsed.
>

Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
diff mbox series

Patch

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index a4308b48dd3e..6f6cd120c4f1 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -246,11 +246,11 @@  int init_of_cache_level(unsigned int cpu)
 		of_node_put(prev);
 		prev = np;
 		if (!of_device_is_compatible(np, "cache"))
-			break;
+			goto err_out;
 		if (of_property_read_u32(np, "cache-level", &level))
-			break;
+			goto err_out;
 		if (level <= levels)
-			break;
+			goto err_out;
 		if (of_property_read_bool(np, "cache-size"))
 			++leaves;
 		if (of_property_read_bool(np, "i-cache-size"))
@@ -265,6 +265,10 @@  int init_of_cache_level(unsigned int cpu)
 	this_cpu_ci->num_leaves = leaves;
 
 	return 0;
+
+err_out:
+	of_node_put(np);
+	return -EINVAL;
 }
 
 #else