1 files changed, 65 insertions, 41 deletions

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index e62a4ccea54d..f35719aab3c1 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -10,11 +10,15 @@
 #include <linux/topology.h>
 #include <linux/device.h>
 #include <linux/node.h>
+#include <linux/gfp.h>
 
 #include "base.h"
 
+static struct sysdev_class_attribute *cpu_sysdev_class_attrs[];
+
 struct sysdev_class cpu_sysdev_class = {
         .name = "cpu",
+        .attrs = cpu_sysdev_class_attrs,
 };
 EXPORT_SYMBOL(cpu_sysdev_class);
 
@@ -35,6 +39,7 @@ static ssize_t __ref store_online(struct sys_device *dev, struct sysdev_attribut
         struct cpu *cpu = container_of(dev, struct cpu, sysdev);
         ssize_t ret;
 
+        cpu_hotplug_driver_lock();
         switch (buf[0]) {
         case '0':
                 ret = cpu_down(cpu->sysdev.id);
@@ -49,6 +54,7 @@ static ssize_t __ref store_online(struct sys_device *dev, struct sysdev_attribut
         default:
                 ret = -EINVAL;
         }
+        cpu_hotplug_driver_unlock();
 
         if (ret >= 0)
                 ret = count;
@@ -72,6 +78,28 @@ void unregister_cpu(struct cpu *cpu)
         per_cpu(cpu_sys_devices, logical_cpu) = NULL;
         return;
 }
+
+#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
+static ssize_t cpu_probe_store(struct sysdev_class *class,
+                               struct sysdev_class_attribute *attr,
+                               const char *buf,
+                               size_t count)
+{
+        return arch_cpu_probe(buf, count);
+}
+
+static ssize_t cpu_release_store(struct sysdev_class *class,
+                                 struct sysdev_class_attribute *attr,
+                                 const char *buf,
+                                 size_t count)
+{
+        return arch_cpu_release(buf, count);
+}
+
+static SYSDEV_CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
+static SYSDEV_CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store);
+#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
+
 #else /* ... !CONFIG_HOTPLUG_CPU */
 static inline void register_cpu_control(struct cpu *cpu)
 {
@@ -97,7 +125,7 @@ static ssize_t show_crash_notes(struct sys_device *dev, struct sysdev_attribute
          * boot up and this data does not change there after. Hence this
          * operation should be safe. No locking required.
          */
-        addr = __pa(per_cpu_ptr(crash_notes, cpunum));
+        addr = per_cpu_ptr_to_phys(per_cpu_ptr(crash_notes, cpunum));
         rc = sprintf(buf, "%Lx\n", addr);
         return rc;
 }
@@ -107,31 +135,39 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);
 /*
  * Print cpu online, possible, present, and system maps
  */
-static ssize_t print_cpus_map(char *buf, const struct cpumask *map)
+
+struct cpu_attr {
+        struct sysdev_class_attribute attr;
+        const struct cpumask *const * const map;
+};
+
+static ssize_t show_cpus_attr(struct sysdev_class *class,
+                              struct sysdev_class_attribute *attr,
+                              char *buf)
 {
-        int n = cpulist_scnprintf(buf, PAGE_SIZE-2, map);
+        struct cpu_attr *ca = container_of(attr, struct cpu_attr, attr);
+        int n = cpulist_scnprintf(buf, PAGE_SIZE-2, *(ca->map));
 
         buf[n++] = '\n';
         buf[n] = '\0';
         return n;
 }
 
-#define print_cpus_func(type) \
-static ssize_t print_cpus_##type(struct sysdev_class *class, char *buf) \
-{                                                                       \
-        return print_cpus_map(buf, cpu_##type##_mask);                  \
-}                                                                       \
-static struct sysdev_class_attribute attr_##type##_map =                \
-        _SYSDEV_CLASS_ATTR(type, 0444, print_cpus_##type, NULL)
+#define _CPU_ATTR(name, map)                                            \
+        { _SYSDEV_CLASS_ATTR(name, 0444, show_cpus_attr, NULL), map }
 
-print_cpus_func(online);
-print_cpus_func(possible);
-print_cpus_func(present);
+/* Keep in sync with cpu_sysdev_class_attrs */
+static struct cpu_attr cpu_attrs[] = {
+        _CPU_ATTR(online, &cpu_online_mask),
+        _CPU_ATTR(possible, &cpu_possible_mask),
+        _CPU_ATTR(present, &cpu_present_mask),
+};
 
 /*
  * Print values for NR_CPUS and offlined cpus
  */
-static ssize_t print_cpus_kernel_max(struct sysdev_class *class, char *buf)
+static ssize_t print_cpus_kernel_max(struct sysdev_class *class,
+                                     struct sysdev_class_attribute *attr, char *buf)
 {
         int n = snprintf(buf, PAGE_SIZE-2, "%d\n", NR_CPUS - 1);
         return n;
@@ -141,7 +177,8 @@ static SYSDEV_CLASS_ATTR(kernel_max, 0444, print_cpus_kernel_max, NULL);
 /* arch-optional setting to enable display of offline cpus >= nr_cpu_ids */
 unsigned int total_cpus;
 
-static ssize_t print_cpus_offline(struct sysdev_class *class, char *buf)
+static ssize_t print_cpus_offline(struct sysdev_class *class,
+                                  struct sysdev_class_attribute *attr, char *buf)
 {
         int n = 0, len = PAGE_SIZE-2;
         cpumask_var_t offline;
@@ -170,29 +207,6 @@ static ssize_t print_cpus_offline(struct sysdev_class *class, char *buf)
 }
 static SYSDEV_CLASS_ATTR(offline, 0444, print_cpus_offline, NULL);
 
-static struct sysdev_class_attribute *cpu_state_attr[] = {
-        &attr_online_map,
-        &attr_possible_map,
-        &attr_present_map,
-        &attr_kernel_max,
-        &attr_offline,
-};
-
-static int cpu_states_init(void)
-{
-        int i;
-        int err = 0;
-
-        for (i = 0;  i < ARRAY_SIZE(cpu_state_attr); i++) {
-                int ret;
-                ret = sysdev_class_create_file(&cpu_sysdev_class,
-                                                cpu_state_attr[i]);
-                if (!err)
-                        err = ret;
-        }
-        return err;
-}
-
 /*
  * register_cpu - Setup a sysfs device for a CPU.
  * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
@@ -238,9 +252,6 @@ int __init cpu_dev_init(void)
         int err;
 
         err = sysdev_class_register(&cpu_sysdev_class);
-        if (!err)
-                err = cpu_states_init();
-
 #if defined(CONFIG_SCHED_MC) || defined(CONFIG_SCHED_SMT)
         if (!err)
                 err = sched_create_sysfs_power_savings_entries(&cpu_sysdev_class);
@@ -248,3 +259,16 @@ int __init cpu_dev_init(void)
 
         return err;
 }
+
+static struct sysdev_class_attribute *cpu_sysdev_class_attrs[] = {
+#ifdef CONFIG_ARCH_CPU_PROBE_RELEASE
+        &attr_probe,
+        &attr_release,
+#endif
+        &cpu_attrs[0].attr,
+        &cpu_attrs[1].attr,
+        &cpu_attrs[2].attr,
+        &attr_kernel_max,
+        &attr_offline,
+        NULL
+};