linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pierre Gondois <pierre.gondois@arm.com>
To: linux-kernel@vger.kernel.org
Cc: "Pierre Gondois" <pierre.gondois@arm.com>,
	"Catalin Marinas" <catalin.marinas@arm.com>,
	"Will Deacon" <will@kernel.org>,
	"Paul Walmsley" <paul.walmsley@sifive.com>,
	"Palmer Dabbelt" <palmer@dabbelt.com>,
	"Albert Ou" <aou@eecs.berkeley.edu>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	"Len Brown" <lenb@kernel.org>,
	"Sudeep Holla" <sudeep.holla@arm.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Gavin Shan" <gshan@redhat.com>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"SeongJae Park" <sj@kernel.org>,
	"Jakub Kicinski" <kuba@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org
Subject: [PATCH 2/5] cacheinfo: Return error code in init_of_cache_level()
Date: Tue,  8 Nov 2022 12:04:18 +0100	[thread overview]
Message-ID: <20221108110424.166896-3-pierre.gondois@arm.com> (raw)
In-Reply-To: <20221108110424.166896-1-pierre.gondois@arm.com>

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(-)

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
-- 
2.25.1


  parent reply	other threads:[~2022-11-08 11:06 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-08 11:04 [PATCH 0/5] arch_topology: Build cacheinfo from primary CPU Pierre Gondois
2022-11-08 11:04 ` [PATCH 1/5] cacheinfo: Use riscv's init_cache_level() as generic OF implem Pierre Gondois
2022-11-08 14:07   ` Conor Dooley
2022-11-08 15:59     ` Sudeep Holla
2022-11-08 17:21       ` Conor Dooley
2022-11-08 16:03   ` Sudeep Holla
2022-11-08 16:08     ` Sudeep Holla
2022-11-08 11:04 ` Pierre Gondois [this message]
2022-11-08 16:05   ` [PATCH 2/5] cacheinfo: Return error code in init_of_cache_level() Sudeep Holla
2022-11-08 11:04 ` [PATCH 3/5] ACPI: PPTT: Remove acpi_find_cache_levels() Pierre Gondois
2022-11-08 16:13   ` Sudeep Holla
2022-11-08 16:56     ` Pierre Gondois
2022-11-10 23:17   ` Jeremy Linton
2022-11-08 11:04 ` [PATCH 4/5] ACPI: PPTT: Update acpi_find_last_cache_level() to acpi_get_cache_info() Pierre Gondois
2022-11-10 23:13   ` Jeremy Linton
2022-11-08 11:04 ` [PATCH 5/5] arch_topology: Build cacheinfo from primary CPU Pierre Gondois
2022-11-08 17:17   ` kernel test robot
2022-11-08 11:11 ` [PATCH 0/5] " Pierre Gondois
2022-11-08 14:04 ` Conor Dooley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221108110424.166896-3-pierre.gondois@arm.com \
    --to=pierre.gondois@arm.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=catalin.marinas@arm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=gshan@redhat.com \
    --cc=kuba@kernel.org \
    --cc=kw@linux.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=rafael@kernel.org \
    --cc=sj@kernel.org \
    --cc=sudeep.holla@arm.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).