diff options
author | Sandeep Tripathy <sandeep.tripathy@linaro.org> | 2014-07-02 05:30:58 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-09 09:45:23 -0400 |
commit | 30fe6884021b9fa0124609e898a6341be188eb44 (patch) | |
tree | f8c7edee62a0c1b01622ccbcf1e166b368822c3d | |
parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) |
cpuidle: move idle traces to cpuidle_enter_state()
idle_exit event is the first event after a core exits
idle state. So this should be traced before local irq
is ebabled. Likewise idle_entry is the last event before
a core enters idle state. This will ease visualising the
cpu idle state from kernel traces.
Signed-off-by: Sandeep Tripathy <sandeep.tripathy@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
[rjw: Subject, rebase]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/cpuidle/cpuidle.c | 2 | ||||
-rw-r--r-- | kernel/sched/idle.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index cb7019977c50..ee9df5e3f5eb 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
@@ -119,11 +119,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, | |||
119 | ktime_t time_start, time_end; | 119 | ktime_t time_start, time_end; |
120 | s64 diff; | 120 | s64 diff; |
121 | 121 | ||
122 | trace_cpu_idle_rcuidle(index, dev->cpu); | ||
122 | time_start = ktime_get(); | 123 | time_start = ktime_get(); |
123 | 124 | ||
124 | entered_state = target_state->enter(dev, drv, index); | 125 | entered_state = target_state->enter(dev, drv, index); |
125 | 126 | ||
126 | time_end = ktime_get(); | 127 | time_end = ktime_get(); |
128 | trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); | ||
127 | 129 | ||
128 | if (!cpuidle_state_is_coupled(dev, drv, entered_state)) | 130 | if (!cpuidle_state_is_coupled(dev, drv, entered_state)) |
129 | local_irq_enable(); | 131 | local_irq_enable(); |
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index cf009fb0bc25..658a58dc30f4 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c | |||
@@ -147,8 +147,6 @@ use_default: | |||
147 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu)) | 147 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu)) |
148 | goto use_default; | 148 | goto use_default; |
149 | 149 | ||
150 | trace_cpu_idle_rcuidle(next_state, dev->cpu); | ||
151 | |||
152 | /* | 150 | /* |
153 | * Enter the idle state previously returned by the governor decision. | 151 | * Enter the idle state previously returned by the governor decision. |
154 | * This function will block until an interrupt occurs and will take | 152 | * This function will block until an interrupt occurs and will take |
@@ -156,8 +154,6 @@ use_default: | |||
156 | */ | 154 | */ |
157 | entered_state = cpuidle_enter(drv, dev, next_state); | 155 | entered_state = cpuidle_enter(drv, dev, next_state); |
158 | 156 | ||
159 | trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); | ||
160 | |||
161 | if (broadcast) | 157 | if (broadcast) |
162 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); | 158 | clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); |
163 | 159 | ||