summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2017-01-09 00:31:48 +0100
committerMichael Ellerman2017-02-06 09:46:04 +0100
commit65e01f386fcddb3460be78fc886856889f80ecc7 (patch)
tree0bea2fc49e3bee2a3d7e16f0bf1d244abec0f9b2 /arch/powerpc/kernel
parentpowerpc/64: Clean up ppc64_caches using a struct per cache (diff)
downloadkernel-qcow2-linux-65e01f386fcddb3460be78fc886856889f80ecc7.tar.gz
kernel-qcow2-linux-65e01f386fcddb3460be78fc886856889f80ecc7.tar.xz
kernel-qcow2-linux-65e01f386fcddb3460be78fc886856889f80ecc7.zip
powerpc/64: Add L2 and L3 cache shape info
Retrieved from device-tree when available Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/setup_64.c26
1 files changed, 21 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index b87dcb2968d9..db18f7b68a1d 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -472,22 +472,38 @@ static bool __init parse_cache_info(struct device_node *np,
void __init initialize_cache_info(void)
{
- struct device_node *np;
+ struct device_node *cpu, *l2, *l3 = NULL;
DBG(" -> initialize_cache_info()\n");
- np = of_find_node_by_type(NULL, "cpu");
+ cpu = of_find_node_by_type(NULL, "cpu");
/*
* We're assuming *all* of the CPUs have the same
* d-cache and i-cache sizes... -Peter
*/
- if (np) {
- if (!parse_cache_info(np, false, &ppc64_caches.l1d))
+ if (cpu) {
+ if (!parse_cache_info(cpu, false, &ppc64_caches.l1d))
DBG("Argh, can't find dcache properties !\n");
- if (!parse_cache_info(np, true, &ppc64_caches.l1i))
+ if (!parse_cache_info(cpu, true, &ppc64_caches.l1i))
DBG("Argh, can't find icache properties !\n");
+
+ /*
+ * Try to find the L2 and L3 if any. Assume they are
+ * unified and use the D-side properties.
+ */
+ l2 = of_find_next_cache_node(cpu);
+ of_node_put(cpu);
+ if (l2) {
+ parse_cache_info(l2, false, &ppc64_caches.l2);
+ l3 = of_find_next_cache_node(l2);
+ of_node_put(l2);
+ }
+ if (l3) {
+ parse_cache_info(l3, false, &ppc64_caches.l3);
+ of_node_put(l3);
+ }
}
/* For use by binfmt_elf */