linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / cpufreq / cpufreq_stats.c

diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 2084593..0bddb8e 100644 (file)
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -19,6 +19,8 @@
 #include <linux/percpu.h>
 #include <linux/kobject.h>
 #include <linux/spinlock.h>
+#include <linux/notifier.h>
+#include <asm/cputime.h>
 
 static spinlock_t cpufreq_stats_lock;
 
@@ -29,20 +31,14 @@ static struct freq_attr _attr_##_name = {\
        .show = _show,\
 };
 
-static unsigned long
-delta_time(unsigned long old, unsigned long new)
-{
-       return (old > new) ? (old - new): (new + ~old + 1);
-}
-
 struct cpufreq_stats {
        unsigned int cpu;
        unsigned int total_trans;
-       unsigned long long last_time;
+       unsigned long long  last_time;
        unsigned int max_state;
        unsigned int state_num;
        unsigned int last_index;
-       unsigned long long *time_in_state;
+       cputime64_t *time_in_state;
        unsigned int *freq_table;
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
        unsigned int *trans_table;
@@ -60,12 +56,16 @@ static int
 cpufreq_stats_update (unsigned int cpu)
 {
        struct cpufreq_stats *stat;
+       unsigned long long cur_time;
+
+       cur_time = get_jiffies_64();
        spin_lock(&cpufreq_stats_lock);
        stat = cpufreq_stats_table[cpu];
        if (stat->time_in_state)
-               stat->time_in_state[stat->last_index] +=
-                       delta_time(stat->last_time, jiffies);
-       stat->last_time = jiffies;
+               stat->time_in_state[stat->last_index] =
+                       cputime64_add(stat->time_in_state[stat->last_index],
+                                     cputime_sub(cur_time, stat->last_time));
+       stat->last_time = cur_time;
        spin_unlock(&cpufreq_stats_lock);
        return 0;
 }
@@ -90,8 +90,8 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf)
                return 0;
        cpufreq_stats_update(stat->cpu);
        for (i = 0; i < stat->state_num; i++) {
-               len += sprintf(buf + len, "%u %llu\n",
-                       stat->freq_table[i], stat->time_in_state[i]);
+               len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i], 
+                       (unsigned long long)cputime64_to_clock_t(stat->time_in_state[i]));
        }
        return len;
 }
@@ -107,16 +107,30 @@ show_trans_table(struct cpufreq_policy *policy, char *buf)
        if(!stat)
                return 0;
        cpufreq_stats_update(stat->cpu);
+       len += snprintf(buf + len, PAGE_SIZE - len, "   From  :    To\n");
+       len += snprintf(buf + len, PAGE_SIZE - len, "         : ");
        for (i = 0; i < stat->state_num; i++) {
                if (len >= PAGE_SIZE)
                        break;
-               len += snprintf(buf + len, PAGE_SIZE - len, "%9u:\t",
+               len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
+                               stat->freq_table[i]);
+       }
+       if (len >= PAGE_SIZE)
+               return len;
+
+       len += snprintf(buf + len, PAGE_SIZE - len, "\n");
+
+       for (i = 0; i < stat->state_num; i++) {
+               if (len >= PAGE_SIZE)
+                       break;
+
+               len += snprintf(buf + len, PAGE_SIZE - len, "%9u: ",
                                stat->freq_table[i]);
 
                for (j = 0; j < stat->state_num; j++)   {
                        if (len >= PAGE_SIZE)
                                break;
-                       len += snprintf(buf + len, PAGE_SIZE - len, "%u\t",
+                       len += snprintf(buf + len, PAGE_SIZE - len, "%9u ",
                                        stat->trans_table[i*stat->max_state+j]);
                }
                len += snprintf(buf + len, PAGE_SIZE - len, "\n");
@@ -179,11 +193,15 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
        unsigned int cpu = policy->cpu;
        if (cpufreq_stats_table[cpu])
                return -EBUSY;
-       if ((stat = kmalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL)
+       if ((stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL)
                return -ENOMEM;
-       memset(stat, 0, sizeof (struct cpufreq_stats));
 
        data = cpufreq_cpu_get(cpu);
+       if (data == NULL) {
+               ret = -EINVAL;
+               goto error_get_fail;
+       }
+
        if ((ret = sysfs_create_group(&data->kobj, &stats_attr_group)))
                goto error_out;
 
@@ -197,18 +215,17 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
                count++;
        }
 
-       alloc_size = count * sizeof(int) + count * sizeof(long long);
+       alloc_size = count * sizeof(int) + count * sizeof(cputime64_t);
 
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
        alloc_size += count * count * sizeof(int);
 #endif
        stat->max_state = count;
-       stat->time_in_state = kmalloc(alloc_size, GFP_KERNEL);
+       stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL);
        if (!stat->time_in_state) {
                ret = -ENOMEM;
                goto error_out;
        }
-       memset(stat->time_in_state, 0, alloc_size);
        stat->freq_table = (unsigned int *)(stat->time_in_state + count);
 
 #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
@@ -224,13 +241,14 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
        }
        stat->state_num = j;
        spin_lock(&cpufreq_stats_lock);
-       stat->last_time = jiffies;
+       stat->last_time = get_jiffies_64();
        stat->last_index = freq_table_get_index(stat, policy->cur);
        spin_unlock(&cpufreq_stats_lock);
        cpufreq_cpu_put(data);
        return 0;
 error_out:
        cpufreq_cpu_put(data);
+error_get_fail:
        kfree(stat);
        cpufreq_stats_table[cpu] = NULL;
        return ret;
@@ -285,6 +303,27 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
        return 0;
 }
 
+static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+                                       unsigned long action, void *hcpu)
+{
+       unsigned int cpu = (unsigned long)hcpu;
+
+       switch (action) {
+       case CPU_ONLINE:
+               cpufreq_update_policy(cpu);
+               break;
+       case CPU_DEAD:
+               cpufreq_stats_free_table(cpu);
+               break;
+       }
+       return NOTIFY_OK;
+}
+
+static struct notifier_block cpufreq_stat_cpu_notifier =
+{
+       .notifier_call = cpufreq_stat_cpu_callback,
+};
+
 static struct notifier_block notifier_policy_block = {
        .notifier_call = cpufreq_stat_notifier_policy
 };
@@ -298,6 +337,7 @@ __init cpufreq_stats_init(void)
 {
        int ret;
        unsigned int cpu;
+
        spin_lock_init(&cpufreq_stats_lock);
        if ((ret = cpufreq_register_notifier(&notifier_policy_block,
                                CPUFREQ_POLICY_NOTIFIER)))
@@ -310,20 +350,31 @@ __init cpufreq_stats_init(void)
                return ret;
        }
 
-       for_each_cpu(cpu)
-               cpufreq_update_policy(cpu);
+       register_cpu_notifier(&cpufreq_stat_cpu_notifier);
+       lock_cpu_hotplug();
+       for_each_online_cpu(cpu) {
+               cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_ONLINE,
+                       (void *)(long)cpu);
+       }
+       unlock_cpu_hotplug();
        return 0;
 }
 static void
 __exit cpufreq_stats_exit(void)
 {
        unsigned int cpu;
+
        cpufreq_unregister_notifier(&notifier_policy_block,
                        CPUFREQ_POLICY_NOTIFIER);
        cpufreq_unregister_notifier(&notifier_trans_block,
                        CPUFREQ_TRANSITION_NOTIFIER);
-       for_each_cpu(cpu)
-               cpufreq_stats_free_table(cpu);
+       unregister_cpu_notifier(&cpufreq_stat_cpu_notifier);
+       lock_cpu_hotplug();
+       for_each_online_cpu(cpu) {
+               cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_DEAD,
+                       (void *)(long)cpu);
+       }
+       unlock_cpu_hotplug();
 }
 
 MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>");