Merge tag 'v3.10.55' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 198a38883e64a0616437401ef2692f5b3c9029a5..92bdb5bad6ba62abb2562af4f3bc29ee6412020a 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -19,9 +19,26 @@
 #include <linux/mutex.h>
 #include <linux/gfp.h>
 #include <linux/suspend.h>
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug debug mechanism                                                  *
+*******************************************************************************/
+#include <linux/kallsyms.h>
+/******************************************************************************/
+#ifdef CONFIG_MT_LOAD_BALANCE_PROFILER
+#include <mtlbprof/mtlbprof.h>
+#endif
 
 #include "smpboot.h"
 
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug and idle integration                                             *
+*******************************************************************************/
+atomic_t is_in_hotplug = ATOMIC_INIT(0);
+void __attribute__((weak)) spm_mcdi_wakeup_all_cores(void) {}
+/******************************************************************************/
+
 #ifdef CONFIG_SMP
 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
 static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -40,7 +57,16 @@ void cpu_maps_update_done(void)
        mutex_unlock(&cpu_add_remove_lock);
 }
 
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug debug mechanism                                                  *
+*******************************************************************************/
+#if defined(MTK_CPU_HOTPLUG_DEBUG_1) || defined(MTK_CPU_HOTPLUG_DEBUG_2)
+RAW_NOTIFIER_HEAD(cpu_chain);
+#else
 static RAW_NOTIFIER_HEAD(cpu_chain);
+#endif
+/******************************************************************************/
 
 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
  * Should always be manipulated under cpu_add_remove_lock
@@ -125,10 +151,25 @@ static void cpu_hotplug_begin(void)
                mutex_unlock(&cpu_hotplug.lock);
                schedule();
        }
+
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug and idle integration                                             *
+*******************************************************************************/
+       atomic_inc(&is_in_hotplug);
+       spm_mcdi_wakeup_all_cores();
+/******************************************************************************/
 }
 
 static void cpu_hotplug_done(void)
 {
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug and idle integration                                             *
+*******************************************************************************/
+       atomic_dec(&is_in_hotplug);
+/******************************************************************************/
+
        cpu_hotplug.active_writer = NULL;
        mutex_unlock(&cpu_hotplug.lock);
 }
@@ -163,6 +204,28 @@ static void cpu_hotplug_done(void) {}
 int __ref register_cpu_notifier(struct notifier_block *nb)
 {
        int ret;
+
+/*******************************************************************************
+* 20131225 marc.huang                                                          *
+* CPU Hotplug debug mechanism                                             *
+*******************************************************************************/
+#ifdef MTK_CPU_HOTPLUG_DEBUG_0
+       static int index = 0;
+ #ifdef CONFIG_KALLSYMS
+       char namebuf[128] = {0};
+       const char *symname;
+       
+       symname = kallsyms_lookup((unsigned long)nb->notifier_call, NULL, NULL, NULL, namebuf);
+       if (symname) 
+               printk("[cpu_ntf] <%02d>%08lx (%s)\n", index++, (unsigned long)nb->notifier_call, symname);
+       else
+               printk("[cpu_ntf] <%02d>%08lx\n", index++, (unsigned long)nb->notifier_call);
+ #else //#ifdef CONFIG_KALLSYMS
+       printk("[cpu_ntf] <%02d>%08lx\n", index++, (unsigned long)nb->notifier_call);
+ #endif //#ifdef CONFIG_KALLSYMS
+#endif //#ifdef MTK_CPU_HOTPLUG_DEBUG_0
+/******************************************************************************/
+
        cpu_maps_update_begin();
        ret = raw_notifier_chain_register(&cpu_chain, nb);
        cpu_maps_update_done();
@@ -330,6 +393,10 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
        while (!idle_cpu(cpu))
                cpu_relax();
 
+#ifdef CONFIG_MT_LOAD_BALANCE_PROFILER
+       mt_lbprof_update_state(cpu, MT_LBPROF_HOTPLUG_STATE);
+#endif
+
        /* This actually kills the CPU. */
        __cpu_die(cpu);
 
@@ -514,6 +581,7 @@ int disable_nonboot_cpus(void)
        cpu_maps_update_done();
        return error;
 }
+EXPORT_SYMBOL_GPL(disable_nonboot_cpus);
 
 void __weak arch_enable_nonboot_cpus_begin(void)
 {
@@ -552,6 +620,7 @@ void __ref enable_nonboot_cpus(void)
 out:
        cpu_maps_update_done();
 }
+EXPORT_SYMBOL_GPL(enable_nonboot_cpus);
 
 static int __init alloc_frozen_cpus(void)
 {
@@ -698,10 +767,12 @@ void set_cpu_present(unsigned int cpu, bool present)
 
 void set_cpu_online(unsigned int cpu, bool online)
 {
-       if (online)
+       if (online) {
                cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits));
-       else
+               cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits));
+       } else {
                cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits));
+       }
 }
 
 void set_cpu_active(unsigned int cpu, bool active)
@@ -726,3 +797,23 @@ void init_cpu_online(const struct cpumask *src)
 {
        cpumask_copy(to_cpumask(cpu_online_bits), src);
 }
+
+static ATOMIC_NOTIFIER_HEAD(idle_notifier);
+
+void idle_notifier_register(struct notifier_block *n)
+{
+       atomic_notifier_chain_register(&idle_notifier, n);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_register);
+
+void idle_notifier_unregister(struct notifier_block *n)
+{
+       atomic_notifier_chain_unregister(&idle_notifier, n);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_unregister);
+
+void idle_notifier_call_chain(unsigned long val)
+{
+       atomic_notifier_call_chain(&idle_notifier, val, NULL);
+}
+EXPORT_SYMBOL_GPL(idle_notifier_call_chain);