1 files changed, 22 insertions, 91 deletions

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 14d5211a185..9cf01e455e5 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -69,9 +69,7 @@ enum s390_cpu_state {
 };
 
 DEFINE_MUTEX(smp_cpu_state_mutex);
-int smp_cpu_polarization[NR_CPUS];
 static int smp_cpu_state[NR_CPUS];
-static int cpu_management;
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
@@ -369,7 +367,7 @@ static int smp_rescan_cpus_sigp(cpumask_t avail)
                 if (cpu_known(cpu_id))
                         continue;
                 __cpu_logical_map[logical_cpu] = cpu_id;
-                smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
+                cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);
                 if (!cpu_stopped(logical_cpu))
                         continue;
                 set_cpu_present(logical_cpu, true);
@@ -403,7 +401,7 @@ static int smp_rescan_cpus_sclp(cpumask_t avail)
                 if (cpu_known(cpu_id))
                         continue;
                 __cpu_logical_map[logical_cpu] = cpu_id;
-                smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
+                cpu_set_polarization(logical_cpu, POLARIZATION_UNKNOWN);
                 set_cpu_present(logical_cpu, true);
                 if (cpu >= info->configured)
                         smp_cpu_state[logical_cpu] = CPU_STATE_STANDBY;
@@ -806,7 +804,7 @@ void __init smp_prepare_boot_cpu(void)
         S390_lowcore.percpu_offset = __per_cpu_offset[0];
         current_set[0] = current;
         smp_cpu_state[0] = CPU_STATE_CONFIGURED;
-        smp_cpu_polarization[0] = POLARIZATION_UNKNWN;
+        cpu_set_polarization(0, POLARIZATION_UNKNOWN);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
@@ -868,7 +866,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev,
                         rc = sclp_cpu_deconfigure(__cpu_logical_map[cpu]);
                         if (!rc) {
                                 smp_cpu_state[cpu] = CPU_STATE_STANDBY;
-                                smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
+                                cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
                         }
                 }
                 break;
@@ -877,7 +875,7 @@ static ssize_t cpu_configure_store(struct sys_device *dev,
                         rc = sclp_cpu_configure(__cpu_logical_map[cpu]);
                         if (!rc) {
                                 smp_cpu_state[cpu] = CPU_STATE_CONFIGURED;
-                                smp_cpu_polarization[cpu] = POLARIZATION_UNKNWN;
+                                cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
                         }
                 }
                 break;
@@ -892,35 +890,6 @@ out:
 static SYSDEV_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t cpu_polarization_show(struct sys_device *dev,
-                                     struct sysdev_attribute *attr, char *buf)
-{
-        int cpu = dev->id;
-        ssize_t count;
-
-        mutex_lock(&smp_cpu_state_mutex);
-        switch (smp_cpu_polarization[cpu]) {
-        case POLARIZATION_HRZ:
-                count = sprintf(buf, "horizontal\n");
-                break;
-        case POLARIZATION_VL:
-                count = sprintf(buf, "vertical:low\n");
-                break;
-        case POLARIZATION_VM:
-                count = sprintf(buf, "vertical:medium\n");
-                break;
-        case POLARIZATION_VH:
-                count = sprintf(buf, "vertical:high\n");
-                break;
-        default:
-                count = sprintf(buf, "unknown\n");
-                break;
-        }
-        mutex_unlock(&smp_cpu_state_mutex);
-        return count;
-}
-static SYSDEV_ATTR(polarization, 0444, cpu_polarization_show, NULL);
-
 static ssize_t show_cpu_address(struct sys_device *dev,
                                 struct sysdev_attribute *attr, char *buf)
 {
@@ -928,13 +897,11 @@ static ssize_t show_cpu_address(struct sys_device *dev,
 }
 static SYSDEV_ATTR(address, 0444, show_cpu_address, NULL);
 
-
 static struct attribute *cpu_common_attrs[] = {
 #ifdef CONFIG_HOTPLUG_CPU
         &attr_configure.attr,
 #endif
         &attr_address.attr,
-        &attr_polarization.attr,
         NULL,
 };
 
@@ -1055,11 +1022,20 @@ static int __devinit smp_add_present_cpu(int cpu)
         rc = sysfs_create_group(&s->kobj, &cpu_common_attr_group);
         if (rc)
                 goto out_cpu;
-        if (!cpu_online(cpu))
-                goto out;
-        rc = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
-        if (!rc)
-                return 0;
+        if (cpu_online(cpu)) {
+                rc = sysfs_create_group(&s->kobj, &cpu_online_attr_group);
+                if (rc)
+                        goto out_online;
+        }
+        rc = topology_cpu_init(c);
+        if (rc)
+                goto out_topology;
+        return 0;
+
+out_topology:
+        if (cpu_online(cpu))
+                sysfs_remove_group(&s->kobj, &cpu_online_attr_group);
+out_online:
         sysfs_remove_group(&s->kobj, &cpu_common_attr_group);
 out_cpu:
 #ifdef CONFIG_HOTPLUG_CPU
@@ -1111,61 +1087,16 @@ static ssize_t __ref rescan_store(struct sysdev_class *class,
 static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct sysdev_class *class,
-                                struct sysdev_class_attribute *attr,
-                                char *buf)
+static int __init s390_smp_init(void)
 {
-        ssize_t count;
-
-        mutex_lock(&smp_cpu_state_mutex);
-        count = sprintf(buf, "%d\n", cpu_management);
-        mutex_unlock(&smp_cpu_state_mutex);
-        return count;
-}
-
-static ssize_t dispatching_store(struct sysdev_class *dev,
-                                 struct sysdev_class_attribute *attr,
-                                 const char *buf,
-                                 size_t count)
-{
-        int val, rc;
-        char delim;
-
-        if (sscanf(buf, "%d %c", &val, &delim) != 1)
-                return -EINVAL;
-        if (val != 0 && val != 1)
-                return -EINVAL;
-        rc = 0;
-        get_online_cpus();
-        mutex_lock(&smp_cpu_state_mutex);
-        if (cpu_management == val)
-                goto out;
-        rc = topology_set_cpu_management(val);
-        if (!rc)
-                cpu_management = val;
-out:
-        mutex_unlock(&smp_cpu_state_mutex);
-        put_online_cpus();
-        return rc ? rc : count;
-}
-static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
-                         dispatching_store);
-
-static int __init topology_init(void)
-{
-        int cpu;
-        int rc;
+        int cpu, rc;
 
         register_cpu_notifier(&smp_cpu_nb);
-
 #ifdef CONFIG_HOTPLUG_CPU
         rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan);
         if (rc)
                 return rc;
 #endif
-        rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching);
-        if (rc)
-                return rc;
         for_each_present_cpu(cpu) {
                 rc = smp_add_present_cpu(cpu);
                 if (rc)
@@ -1173,4 +1104,4 @@ static int __init topology_init(void)
         }
         return 0;
 }
-subsys_initcall(topology_init);
+subsys_initcall(s390_smp_init);