|
@@ -14,7 +14,6 @@
|
|
|
#include <linux/cpuidle.h>
|
|
|
#include <linux/cpu_pm.h>
|
|
|
#include <linux/export.h>
|
|
|
-#include <linux/clockchips.h>
|
|
|
|
|
|
#include <asm/proc-fns.h>
|
|
|
|
|
@@ -82,7 +81,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
|
|
|
int index)
|
|
|
{
|
|
|
struct omap4_idle_statedata *cx = &omap4_idle_data[index];
|
|
|
- int cpu_id = smp_processor_id();
|
|
|
|
|
|
local_fiq_disable();
|
|
|
|
|
@@ -109,8 +107,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
|
|
|
-
|
|
|
/*
|
|
|
* Call idle CPU PM enter notifier chain so that
|
|
|
* VFP and per CPU interrupt context is saved.
|
|
@@ -152,8 +148,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
|
|
|
if (omap4_mpuss_read_prev_context_state())
|
|
|
cpu_cluster_pm_exit();
|
|
|
|
|
|
- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
|
|
|
-
|
|
|
fail:
|
|
|
cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
|
|
|
cpu_done[dev->cpu] = false;
|
|
@@ -163,16 +157,6 @@ fail:
|
|
|
return index;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * For each cpu, setup the broadcast timer because local timers
|
|
|
- * stops for the states above C1.
|
|
|
- */
|
|
|
-static void omap_setup_broadcast_timer(void *arg)
|
|
|
-{
|
|
|
- int cpu = smp_processor_id();
|
|
|
- clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
|
|
|
-}
|
|
|
-
|
|
|
static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
|
|
|
|
|
|
static struct cpuidle_driver omap4_idle_driver = {
|
|
@@ -193,7 +177,8 @@ static struct cpuidle_driver omap4_idle_driver = {
|
|
|
/* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
|
|
|
.exit_latency = 328 + 440,
|
|
|
.target_residency = 960,
|
|
|
- .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
|
|
|
+ .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
|
|
|
+ CPUIDLE_FLAG_TIMER_STOP,
|
|
|
.enter = omap4_enter_idle_coupled,
|
|
|
.name = "C2",
|
|
|
.desc = "MPUSS CSWR",
|
|
@@ -202,7 +187,8 @@ static struct cpuidle_driver omap4_idle_driver = {
|
|
|
/* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
|
|
|
.exit_latency = 460 + 518,
|
|
|
.target_residency = 1100,
|
|
|
- .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
|
|
|
+ .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
|
|
|
+ CPUIDLE_FLAG_TIMER_STOP,
|
|
|
.enter = omap4_enter_idle_coupled,
|
|
|
.name = "C3",
|
|
|
.desc = "MPUSS OSWR",
|
|
@@ -236,9 +222,6 @@ int __init omap4_idle_init(void)
|
|
|
if (!cpu_clkdm[0] || !cpu_clkdm[1])
|
|
|
return -ENODEV;
|
|
|
|
|
|
- /* Configure the broadcast timer on each cpu */
|
|
|
- on_each_cpu(omap_setup_broadcast_timer, NULL, 1);
|
|
|
-
|
|
|
for_each_cpu(cpu_id, cpu_online_mask) {
|
|
|
dev = &per_cpu(omap4_idle_dev, cpu_id);
|
|
|
dev->cpu = cpu_id;
|