Skip to content

Commit 604f32e

Browse files
cuiyunhuipalmer-dabbelt
authored andcommitted
riscv: cacheinfo: initialize cacheinfo's level and type from ACPI PPTT
Before cacheinfo can be built correctly, we need to initialize level and type. Since RISC-V currently does not have a register group that describes cache-related attributes like ARM64, we cannot obtain them directly, so now we obtain cache leaves from the ACPI PPTT table (acpi_get_cache_info()) and set the cache type through split_levels. Suggested-by: Jeremy Linton <[email protected]> Suggested-by: Sudeep Holla <[email protected]> Reviewed-by: Conor Dooley <[email protected]> Reviewed-by: Sunil V L <[email protected]> Reviewed-by: Jeremy Linton <[email protected]> Reviewed-by: Sudeep Holla <[email protected]> Signed-off-by: Yunhui Cui <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent ee3fab1 commit 604f32e

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

arch/riscv/kernel/cacheinfo.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (C) 2017 SiFive
44
*/
55

6+
#include <linux/acpi.h>
67
#include <linux/cpu.h>
78
#include <linux/of.h>
89
#include <asm/cacheinfo.h>
@@ -78,6 +79,27 @@ int populate_cache_leaves(unsigned int cpu)
7879
struct device_node *prev = NULL;
7980
int levels = 1, level = 1;
8081

82+
if (!acpi_disabled) {
83+
int ret, fw_levels, split_levels;
84+
85+
ret = acpi_get_cache_info(cpu, &fw_levels, &split_levels);
86+
if (ret)
87+
return ret;
88+
89+
BUG_ON((split_levels > fw_levels) ||
90+
(split_levels + fw_levels > this_cpu_ci->num_leaves));
91+
92+
for (; level <= this_cpu_ci->num_levels; level++) {
93+
if (level <= split_levels) {
94+
ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
95+
ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
96+
} else {
97+
ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
98+
}
99+
}
100+
return 0;
101+
}
102+
81103
if (of_property_read_bool(np, "cache-size"))
82104
ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
83105
if (of_property_read_bool(np, "i-cache-size"))

0 commit comments

Comments
 (0)