[PATCH] riscv: cacheinfo: Add back init_cache_level() function

[PATCH] riscv: cacheinfo: Add back init_cache_level() function

[Steffen Persvold]

commit 5944ce092b97 (arch_topology: Build cacheinfo from primary CPU)
removed the init_cache_level() function from arch/riscv/kernel/cacheinfo.c
and relies on the init_cpu_topology() function in drivers/base/arch_topology.c
to call fetch_cache_info() which in turn calls init_of_cache_level() to
populate the cache hierarchy information. However, init_cpu_topology() is only
called from smpboot.c:smp_prepare_cpus() and thus only available when
CONFIG_SMP is defined.

To support non-SMP enabled kernels to still detect cache hierarchy, we add back
the init_cache_level() function. The init_level_allocate_ci() function handles
this gracefully on SMP-enabled kernels anyway where fetch_cache_info() is
called from init_cpu_topology() earlier in the boot phase.

Signed-off-by: Steffen Persvold <spersvold@gmail.com>
---
 arch/riscv/kernel/cacheinfo.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/riscv/kernel/cacheinfo.c b/arch/riscv/kernel/cacheinfo.c
index 09e9b881..42c22f83 100644
--- a/arch/riscv/kernel/cacheinfo.c
+++ b/arch/riscv/kernel/cacheinfo.c
@@ -71,6 +71,11 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
 	this_leaf->type = type;
 }
 
+int init_cache_level(unsigned int cpu)
+{
+	return init_of_cache_level(cpu);
+}
+
 int populate_cache_leaves(unsigned int cpu)
 {
 	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
-- 
2.40.1

Re: [PATCH] riscv: cacheinfo: Add back init_cache_level() function

[patchwork-bot+linux-riscv]

Hello:

This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:

On Sun,  7 Jul 2024 02:35:15 +0200 you wrote:
> commit 5944ce092b97 (arch_topology: Build cacheinfo from primary CPU)
> removed the init_cache_level() function from arch/riscv/kernel/cacheinfo.c
> and relies on the init_cpu_topology() function in drivers/base/arch_topology.c
> to call fetch_cache_info() which in turn calls init_of_cache_level() to
> populate the cache hierarchy information. However, init_cpu_topology() is only
> called from smpboot.c:smp_prepare_cpus() and thus only available when
> CONFIG_SMP is defined.
> 
> [...]

Here is the summary with links:
  - riscv: cacheinfo: Add back init_cache_level() function
    https://git.kernel.org/riscv/c/1845d381f280

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html