From: Justin Chen <justin.chen@xxxxxxxxxxxx> Add cacheinfo support for MIPS architectures. Use information from the cpuinfo_mips struct to populate the cacheinfo struct. This allows an architecture agnostic approach, however this also means if cache information is not properly populated within the cpuinfo_mips struct, there is nothing we can do. (I.E. c-r3k.c) Signed-off-by: Justin Chen <justin.chen@xxxxxxxxxxxx> --- arch/mips/kernel/Makefile | 8 ++-- arch/mips/kernel/cacheinfo.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 arch/mips/kernel/cacheinfo.c diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 4a603a3ea657..712c1ae6afdc 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -4,10 +4,10 @@ extra-y := head.o vmlinux.lds -obj-y += cpu-probe.o branch.o elf.o entry.o genex.o idle.o irq.o \ - process.o prom.o ptrace.o reset.o setup.o signal.o \ - syscall.o time.o topology.o traps.o unaligned.o watch.o \ - vdso.o +obj-y += cpu-probe.o branch.o cacheinfo.o elf.o entry.o genex.o \ + idle.o irq.o process.o prom.o ptrace.o reset.o setup.o \ + signal.o syscall.o time.o topology.o traps.o unaligned.o \ + watch.o vdso.o ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_ftrace.o = -pg diff --git a/arch/mips/kernel/cacheinfo.c b/arch/mips/kernel/cacheinfo.c new file mode 100644 index 000000000000..11e6ad7ed0d2 --- /dev/null +++ b/arch/mips/kernel/cacheinfo.c @@ -0,0 +1,90 @@ +/* + * MIPS cacheinfo support + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include <linux/cacheinfo.h> + +/* Populates leaf and increments to next leaf */ +#define populate_cache(cache, leaf, c_level, c_type) \ + leaf->type = c_type; \ + leaf->level = c_level; \ + leaf->coherency_line_size = cache.linesz; \ + leaf->number_of_sets = cache.sets; \ + leaf->ways_of_associativity = cache.ways; \ + leaf->size = cache.linesz * cache.sets * cache.ways; + +static int __init_cache_level(unsigned int cpu) +{ + struct cpuinfo_mips *c = ¤t_cpu_data; + struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + int levels = 0, leaves = 0; + + /* + * If Dcache is not set, we assume the cache structures + * are not properly initialized. + */ + if (c->dcache.waysize) + levels += 1; + else + return -ENOENT; + + leaves += (c->icache.waysize) ? 2 : 1; + + if (c->scache.waysize) { + levels++; + leaves++; + } + + if (c->tcache.waysize) { + levels++; + leaves++; + } + + this_cpu_ci->num_levels = levels; + this_cpu_ci->num_leaves = leaves; + + return 0; +} + +static int __populate_cache_leaves(unsigned int cpu) +{ + struct cpuinfo_mips *c = ¤t_cpu_data; + struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); + struct cacheinfo *this_leaf = this_cpu_ci->info_list; + + if (c->icache.waysize) { + populate_cache(c->dcache, this_leaf, 1, CACHE_TYPE_DATA); + this_leaf++; + populate_cache(c->icache, this_leaf, 1, CACHE_TYPE_INST); + this_leaf++; + } else { + populate_cache(c->dcache, this_leaf, 1, CACHE_TYPE_UNIFIED); + this_leaf++; + } + + if (c->scache.waysize) { + populate_cache(c->scache, this_leaf, 2, CACHE_TYPE_UNIFIED); + this_leaf++; + } + + if (c->tcache.waysize) { + populate_cache(c->tcache, this_leaf, 3, CACHE_TYPE_UNIFIED); + this_leaf++; + } + + return 0; +} + +DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level) +DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves) -- 2.11.0
