1 files changed, 92 insertions, 296 deletions

diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c
index c0b03c28d157..fe21f074cf9f 100644
--- a/arch/s390/kernel/cache.c
+++ b/arch/s390/kernel/cache.c
@@ -5,37 +5,11 @@
  *    Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
  */
 
-#include <linux/notifier.h>
 #include <linux/seq_file.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/slab.h>
 #include <linux/cpu.h>
+#include <linux/cacheinfo.h>
 #include <asm/facility.h>
 
-struct cache {
-        unsigned long size;
-        unsigned int line_size;
-        unsigned int associativity;
-        unsigned int nr_sets;
-        unsigned int level   : 3;
-        unsigned int type    : 2;
-        unsigned int private : 1;
-        struct list_head list;
-};
-
-struct cache_dir {
-        struct kobject *kobj;
-        struct cache_index_dir *index;
-};
-
-struct cache_index_dir {
-        struct kobject kobj;
-        int cpu;
-        struct cache *cache;
-        struct cache_index_dir *next;
-};
-
 enum {
         CACHE_SCOPE_NOTEXISTS,
         CACHE_SCOPE_PRIVATE,
@@ -44,10 +18,10 @@ enum {
 };
 
 enum {
-        CACHE_TYPE_SEPARATE,
-        CACHE_TYPE_DATA,
-        CACHE_TYPE_INSTRUCTION,
-        CACHE_TYPE_UNIFIED,
+        CTYPE_SEPARATE,
+        CTYPE_DATA,
+        CTYPE_INSTRUCTION,
+        CTYPE_UNIFIED,
 };
 
 enum {
@@ -70,39 +44,59 @@ struct cache_info {
 };
 
 #define CACHE_MAX_LEVEL 8
-
 union cache_topology {
         struct cache_info ci[CACHE_MAX_LEVEL];
         unsigned long long raw;
 };
 
 static const char * const cache_type_string[] = {
-        "Data",
+        "",
         "Instruction",
+        "Data",
+        "",
         "Unified",
 };
 
-static struct cache_dir *cache_dir_cpu[NR_CPUS];
-static LIST_HEAD(cache_list);
+static const enum cache_type cache_type_map[] = {
+        [CTYPE_SEPARATE] = CACHE_TYPE_SEPARATE,
+        [CTYPE_DATA] = CACHE_TYPE_DATA,
+        [CTYPE_INSTRUCTION] = CACHE_TYPE_INST,
+        [CTYPE_UNIFIED] = CACHE_TYPE_UNIFIED,
+};
 
 void show_cacheinfo(struct seq_file *m)
 {
-        struct cache *cache;
-        int index = 0;
+        int cpu = smp_processor_id(), idx;
+        struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
+        struct cacheinfo *cache;
 
-        list_for_each_entry(cache, &cache_list, list) {
-                seq_printf(m, "cache%-11d: ", index);
+        for (idx = 0; idx < this_cpu_ci->num_leaves; idx++) {
+                cache = this_cpu_ci->info_list + idx;
+                seq_printf(m, "cache%-11d: ", idx);
                 seq_printf(m, "level=%d ", cache->level);
                 seq_printf(m, "type=%s ", cache_type_string[cache->type]);
-                seq_printf(m, "scope=%s ", cache->private ? "Private" : "Shared");
-                seq_printf(m, "size=%luK ", cache->size >> 10);
-                seq_printf(m, "line_size=%u ", cache->line_size);
-                seq_printf(m, "associativity=%d", cache->associativity);
+                seq_printf(m, "scope=%s ",
+                           cache->disable_sysfs ? "Shared" : "Private");
+                seq_printf(m, "size=%dK ", cache->size >> 10);
+                seq_printf(m, "line_size=%u ", cache->coherency_line_size);
+                seq_printf(m, "associativity=%d", cache->ways_of_associativity);
                 seq_puts(m, "\n");
-                index++;
         }
 }
 
+static inline enum cache_type get_cache_type(struct cache_info *ci, int level)
+{
+        if (level >= CACHE_MAX_LEVEL)
+                return CACHE_TYPE_NOCACHE;
+
+        ci += level;
+
+        if (ci->scope != CACHE_SCOPE_SHARED && ci->scope != CACHE_SCOPE_PRIVATE)
+                return CACHE_TYPE_NOCACHE;
+
+        return cache_type_map[ci->type];
+}
+
 static inline unsigned long ecag(int ai, int li, int ti)
 {
         unsigned long cmd, val;
@@ -113,277 +107,79 @@ static inline unsigned long ecag(int ai, int li, int ti)
         return val;
 }
 
-static int __init cache_add(int level, int private, int type)
+static void ci_leaf_init(struct cacheinfo *this_leaf, int private,
+                         enum cache_type type, unsigned int level)
 {
-        struct cache *cache;
-        int ti;
+        int ti, num_sets;
+        int cpu = smp_processor_id();
 
-        cache = kzalloc(sizeof(*cache), GFP_KERNEL);
-        if (!cache)
-                return -ENOMEM;
-        if (type == CACHE_TYPE_INSTRUCTION)
+        if (type == CACHE_TYPE_INST)
                 ti = CACHE_TI_INSTRUCTION;
         else
                 ti = CACHE_TI_UNIFIED;
-        cache->size = ecag(EXTRACT_SIZE, level, ti);
-        cache->line_size = ecag(EXTRACT_LINE_SIZE, level, ti);
-        cache->associativity = ecag(EXTRACT_ASSOCIATIVITY, level, ti);
-        cache->nr_sets = cache->size / cache->associativity;
-        cache->nr_sets /= cache->line_size;
-        cache->private = private;
-        cache->level = level + 1;
-        cache->type = type - 1;
-        list_add_tail(&cache->list, &cache_list);
-        return 0;
-}
-
-static void __init cache_build_info(void)
-{
-        struct cache *cache, *next;
-        union cache_topology ct;
-        int level, private, rc;
-
-        ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);
-        for (level = 0; level < CACHE_MAX_LEVEL; level++) {
-                switch (ct.ci[level].scope) {
-                case CACHE_SCOPE_SHARED:
-                        private = 0;
-                        break;
-                case CACHE_SCOPE_PRIVATE:
-                        private = 1;
-                        break;
-                default:
-                        return;
-                }
-                if (ct.ci[level].type == CACHE_TYPE_SEPARATE) {
-                        rc  = cache_add(level, private, CACHE_TYPE_DATA);
-                        rc |= cache_add(level, private, CACHE_TYPE_INSTRUCTION);
-                } else {
-                        rc = cache_add(level, private, ct.ci[level].type);
-                }
-                if (rc)
-                        goto error;
-        }
-        return;
-error:
-        list_for_each_entry_safe(cache, next, &cache_list, list) {