1 files changed, 33 insertions, 72 deletions

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 13559c993847..94b06c31fc8a 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -18,55 +18,20 @@
 #include <linux/cpuset.h>
 #include <asm/delay.h>
 #include <asm/s390_ext.h>
-#include <asm/sysinfo.h>
-
-#define CPU_BITS 64
-#define NR_MAG 6
 
 #define PTF_HORIZONTAL  (0UL)
 #define PTF_VERTICAL    (1UL)
 #define PTF_CHECK       (2UL)
 
-struct tl_cpu {
-        unsigned char reserved0[4];
-        unsigned char :6;
-        unsigned char pp:2;
-        unsigned char reserved1;
-        unsigned short origin;
-        unsigned long mask[CPU_BITS / BITS_PER_LONG];
-};
-
-struct tl_container {
-        unsigned char reserved[7];
-        unsigned char id;
-};
-
-union tl_entry {
-        unsigned char nl;
-        struct tl_cpu cpu;
-        struct tl_container container;
-};
-
-struct tl_info {
-        unsigned char reserved0[2];
-        unsigned short length;
-        unsigned char mag[NR_MAG];
-        unsigned char reserved1;
-        unsigned char mnest;
-        unsigned char reserved2[4];
-        union tl_entry tle[0];
-};
-
 struct mask_info {
         struct mask_info *next;
         unsigned char id;
         cpumask_t mask;
 };
 
-static int topology_enabled;
+static int topology_enabled = 1;
 static void topology_work_fn(struct work_struct *work);
-static struct tl_info *tl_info;
-static int machine_has_topology;
+static struct sysinfo_15_1_x *tl_info;
 static struct timer_list topology_timer;
 static void set_topology_timer(void);
 static DECLARE_WORK(topology_work, topology_work_fn);
@@ -88,8 +53,10 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
         cpumask_t mask;
 
         cpus_clear(mask);
-        if (!topology_enabled || !machine_has_topology)
-                return cpu_possible_map;
+        if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {
+                cpumask_copy(&mask, cpumask_of(cpu));
+                return mask;
+        }
         while (info) {
                 if (cpu_isset(cpu, info->mask)) {
                         mask = info->mask;
@@ -102,18 +69,18 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
         return mask;
 }
 
-static void add_cpus_to_mask(struct tl_cpu *tl_cpu, struct mask_info *book,
-                             struct mask_info *core)
+static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
+                             struct mask_info *book, struct mask_info *core)
 {
         unsigned int cpu;
 
-        for (cpu = find_first_bit(&tl_cpu->mask[0], CPU_BITS);
-             cpu < CPU_BITS;
-             cpu = find_next_bit(&tl_cpu->mask[0], CPU_BITS, cpu + 1))
+        for (cpu = find_first_bit(&tl_cpu->mask[0], TOPOLOGY_CPU_BITS);
+             cpu < TOPOLOGY_CPU_BITS;
+             cpu = find_next_bit(&tl_cpu->mask[0], TOPOLOGY_CPU_BITS, cpu + 1))
         {
                 unsigned int rcpu, lcpu;
 
-                rcpu = CPU_BITS - 1 - cpu + tl_cpu->origin;
+                rcpu = TOPOLOGY_CPU_BITS - 1 - cpu + tl_cpu->origin;
                 for_each_present_cpu(lcpu) {
                         if (cpu_logical_map(lcpu) != rcpu)
                                 continue;
@@ -146,15 +113,14 @@ static void clear_masks(void)
 #endif
 }
 
-static union tl_entry *next_tle(union tl_entry *tle)
+static union topology_entry *next_tle(union topology_entry *tle)
 {
-        if (tle->nl)
-                return (union tl_entry *)((struct tl_container *)tle + 1);
-        else
-                return (union tl_entry *)((struct tl_cpu *)tle + 1);
+        if (!tle->nl)
+                return (union topology_entry *)((struct topology_cpu *)tle + 1);
+        return (union topology_entry *)((struct topology_container *)tle + 1);
 }
 
-static void tl_to_cores(struct tl_info *info)
+static void tl_to_cores(struct sysinfo_15_1_x *info)
 {
 #ifdef CONFIG_SCHED_BOOK
         struct mask_info *book = &book_info;
@@ -162,13 +128,13 @@ static void tl_to_cores(struct tl_info *info)
         struct mask_info *book = NULL;
 #endif
         struct mask_info *core = &core_info;
-        union tl_entry *tle, *end;
+        union topology_entry *tle, *end;
 
 
         spin_lock_irq(&topology_lock);
         clear_masks();
         tle = info->tle;
-        end = (union tl_entry *)((unsigned long)info + info->length);
+        end = (union topology_entry *)((unsigned long)info + info->length);
         while (tle < end) {
                 switch (tle->nl) {
 #ifdef CONFIG_SCHED_BOOK
@@ -186,7 +152,6 @@ static void tl_to_cores(struct tl_info *info)
                         break;
                 default:
                         clear_masks();
-                        machine_has_topology = 0;
                         goto out;
                 }
                 tle = next_tle(tle);
@@ -223,7 +188,7 @@ int topology_set_cpu_management(int fc)
         int cpu;
         int rc;
 
-        if (!machine_has_topology)
+        if (!MACHINE_HAS_TOPOLOGY)
                 return -EOPNOTSUPP;
         if (fc)
                 rc = ptf(PTF_VERTICAL);
@@ -251,7 +216,7 @@ static void update_cpu_core_map(void)
         spin_unlock_irqrestore(&topology_lock, flags);
 }
 
-static void store_topology(struct tl_info *info)
+void store_topology(struct sysinfo_15_1_x *info)
 {
 #ifdef CONFIG_SCHED_BOOK
         int rc;
@@ -265,11 +230,11 @@ static void store_topology(struct tl_info *info)
 
 int arch_update_cpu_topology(void)
 {
-        struct tl_info *info = tl_info;
+        struct sysinfo_15_1_x *info = tl_info;
         struct sys_device *sysdev;
         int cpu;
 
-        if (!machine_has_topology) {
+        if (!MACHINE_HAS_TOPOLOGY) {
                 update_cpu_core_map();
                 topology_update_polarization_simple();
                 return 0;
@@ -311,9 +276,9 @@ static void set_topology_timer(void)
 
 static int __init early_parse_topology(char *p)
 {
-        if (strncmp(p, "on", 2))
+        if (strncmp(p, "off", 3))
                 return 0;
-        topology_enabled = 1;
+        topology_enabled = 0;
         return 0;
 }
 early_param("topology", early_parse_topology);
@@ -323,7 +288,7 @@ static int __init init_topology_update(void)
         int rc;
 
         rc = 0;
-        if (!machine_has_topology) {
+        if (!MACHINE_HAS_TOPOLOGY) {
                 topology_update_polarization_simple();
                 goto out;
         }
@@ -335,13 +300,14 @@ out:
 }
 __initcall(init_topology_update);
 
-static void alloc_masks(struct tl_info *info, struct mask_info *mask, int offset)
+static void alloc_masks(struct sysinfo_15_1_x *info, struct mask_info *mask,
+                        int offset)
 {
         int i, nr_masks;
 
-        nr_masks = info->mag[NR_MAG - offset];
+        nr_masks = info->mag[TOPOLOGY_NR_MAG - offset];
         for (i = 0; i < info->mnest - offset; i++)
-                nr_masks *= info->mag[NR_MAG - offset - 1 - i];
+                nr_masks *= info->mag[TOPOLOGY_NR_MAG - offset - 1 - i];
         nr_masks = max(nr_masks, 1);
         for (i = 0; i < nr_masks; i++) {
                 mask->next = alloc_bootmem(sizeof(struct mask_info));
@@ -351,21 +317,16 @@ static void alloc_masks(struct tl_info *info, struct mask_info *mask, int offset
 
 void __init s390_init_cpu_topology(void)
 {
-        unsigned long long facility_bits;
-        struct tl_info *info;
+        struct sysinfo_15_1_x *info;
         int i;
 
-        if (stfle(&facility_bits, 1) <= 0)
-                return;
-        if (!(facility_bits & (1ULL << 52)) || !(facility_bits & (1ULL << 61)))
+        if (!MACHINE_HAS_TOPOLOGY)
                 return;
-        machine_has_topology = 1;
-
         tl_info = alloc_bootmem_pages(PAGE_SIZE);
         info = tl_info;
         store_topology(info);
         pr_info("The CPU configuration topology of the machine is:");
-        for (i = 0; i < NR_MAG; i++)
+        for (i = 0; i < TOPOLOGY_NR_MAG; i++)
                 printk(" %d", info->mag[i]);
         printk(" / %d\n", info->mnest);
         alloc_masks(info, &core_info, 2);