sysdev: Convert cpu driver sysdev class attributes

[safe/jmp/linux-2.6] / drivers / base / cpu.c

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 64f5d54..b04ecfc 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -35,6 +35,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 +50,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 +74,38 @@ 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 class *class, const char *buf,
+                              size_t count)
+{
+       return arch_cpu_probe(buf, count);
+}
+
+static ssize_t cpu_release_store(struct class *class, const char *buf,
+                                size_t count)
+{
+       return arch_cpu_release(buf, count);
+}
+
+static CLASS_ATTR(probe, S_IWUSR, NULL, cpu_probe_store);
+static CLASS_ATTR(release, S_IWUSR, NULL, cpu_release_store);
+
+int __init cpu_probe_release_init(void)
+{
+       int rc;
+
+       rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
+                              &class_attr_probe.attr);
+       if (!rc)
+               rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
+                                      &class_attr_release.attr);
+
+       return rc;
+}
+device_initcall(cpu_probe_release_init);
+#endif /* CONFIG_ARCH_CPU_PROBE_RELEASE */
+
 #else /* ... !CONFIG_HOTPLUG_CPU */
 static inline void register_cpu_control(struct cpu *cpu)
 {
@@ -97,7 +131,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 +141,83 @@ 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, cpumask_t *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##_map);                  \
-}                                                                      \
-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 }
+
+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_cpus_func(online);
-print_cpus_func(possible);
-print_cpus_func(present);
+/*
+ * Print values for NR_CPUS and offlined cpus
+ */
+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;
+}
+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,
+                                 struct sysdev_class_attribute *attr, char *buf)
+{
+       int n = 0, len = PAGE_SIZE-2;
+       cpumask_var_t offline;
+
+       /* display offline cpus < nr_cpu_ids */
+       if (!alloc_cpumask_var(&offline, GFP_KERNEL))
+               return -ENOMEM;
+       cpumask_complement(offline, cpu_online_mask);
+       n = cpulist_scnprintf(buf, len, offline);
+       free_cpumask_var(offline);
+
+       /* display offline cpus >= nr_cpu_ids */
+       if (total_cpus && nr_cpu_ids < total_cpus) {
+               if (n && n < len)
+                       buf[n++] = ',';
+
+               if (nr_cpu_ids == total_cpus-1)
+                       n += snprintf(&buf[n], len - n, "%d", nr_cpu_ids);
+               else
+                       n += snprintf(&buf[n], len - n, "%d-%d",
+                                                     nr_cpu_ids, total_cpus-1);
+       }
+
+       n += snprintf(&buf[n], len - n, "\n");
+       return n;
+}
+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,
+       &cpu_attrs[0].attr,
+       &cpu_attrs[1].attr,
+       &cpu_attrs[2].attr,
+       &attr_kernel_max,
+       &attr_offline,
 };
 
 static int cpu_states_init(void)