From patchwork Wed Aug 25 15:21:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 131951 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7PFLPpT014946 for ; Wed, 25 Aug 2010 15:21:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751527Ab0HYPVY (ORCPT ); Wed, 25 Aug 2010 11:21:24 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:40444 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751397Ab0HYPVY (ORCPT ); Wed, 25 Aug 2010 11:21:24 -0400 Received: by qyk9 with SMTP id 9so4959339qyk.19 for ; Wed, 25 Aug 2010 08:21:23 -0700 (PDT) MIME-Version: 1.0 Received: by 10.224.57.65 with SMTP id b1mr5642900qah.252.1282749683103; Wed, 25 Aug 2010 08:21:23 -0700 (PDT) Received: by 10.229.51.19 with HTTP; Wed, 25 Aug 2010 08:21:22 -0700 (PDT) X-Originating-IP: [81.243.44.167] Date: Wed, 25 Aug 2010 17:21:22 +0200 Message-ID: Subject: [PATCH] OMAP2: add cpuidle and cpufreq events tracing From: Jean Pihet To: linux-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 25 Aug 2010 15:21:25 +0000 (UTC) diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c index 3d3d035..6113bd9 100644 --- a/arch/arm/mach-omap2/cpuidle34xx.c +++ b/arch/arm/mach-omap2/cpuidle34xx.c @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -130,6 +131,7 @@ static int omap3_enter_idle(struct cpuidle_device *dev, local_irq_disable(); local_fiq_disable(); + trace_power_start(POWER_CSTATE, cx->type, smp_processor_id()); pwrdm_set_next_pwrst(mpu_pd, mpu_state); pwrdm_set_next_pwrst(core_pd, core_state); diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index f25bc3d..ea3b816 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -588,6 +589,7 @@ static void omap3_pm_idle(void) if (omap_irq_pending() || need_resched()) goto out; + trace_power_start(POWER_CSTATE, 1, smp_processor_id()); omap_sram_idle(); out: @@ -628,6 +630,8 @@ static int omap3_pm_suspend(void) omap2_pm_wakeup_on_timer(wakeup_timer_seconds, wakeup_timer_milliseconds); + trace_power_start(POWER_CSTATE, -1, smp_processor_id()); + /* Read current next_pwrsts */ list_for_each_entry(pwrst, &pwrst_list, node) pwrst->saved_state = pwrdm_read_next_pwrst(pwrst->pwrdm); diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c index df08829..cc4e41f 100644 --- a/arch/arm/plat-omap/cpu-omap.c +++ b/arch/arm/plat-omap/cpu-omap.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -116,8 +117,10 @@ static int omap_target(struct cpufreq_policy *policy, cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); #elif defined(CONFIG_ARCH_OMAP3) && !defined(CONFIG_OMAP_PM_NONE) freq = target_freq * 1000; - if (opp_find_freq_ceil(mpu_dev, &freq)) + if (opp_find_freq_ceil(mpu_dev, &freq)) { + trace_power_frequency(POWER_PSTATE, freq, smp_processor_id()); omap_pm_cpu_set_freq(freq); + } #endif return ret; }