From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836Ab0IQWKc (ORCPT ); Fri, 17 Sep 2010 18:10:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47429 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754728Ab0IQWKa (ORCPT ); Fri, 17 Sep 2010 18:10:30 -0400 From: Thomas Renninger To: Jean Pihet Subject: Re: [PATCH] tracing, perf: add more power related events Date: Sat, 18 Sep 2010 00:10:16 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.34.4-0.1.99.9.f8e4270-desktop; KDE/4.4.4; x86_64; ; ) Cc: Ingo Molnar , Arjan van de Ven , Peter Zijlstra , Len Brown , arjan@infradead.org, Kevin Hilman , linux-kernel@vger.kernel.org, discuss@lesswatts.org, linux-pm@lists.linux-foundation.org, linux-omap@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-trace-users@vger.kernel.org References: <201009171508.46471.trenn@suse.de> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201009180010.17380.trenn@suse.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org power-trace: Add x86 ACPI S- (machine sleep) state events. Signed-off-by: Thomas Renninger --- drivers/acpi/sleep.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: linux-2.6.35-master/drivers/acpi/sleep.c =================================================================== --- linux-2.6.35-master.orig/drivers/acpi/sleep.c +++ linux-2.6.35-master/drivers/acpi/sleep.c @@ -17,6 +17,8 @@ #include #include +#include + #include #include @@ -249,14 +251,19 @@ static int acpi_suspend_enter(suspend_st unsigned long flags = 0; u32 acpi_state = acpi_target_sleep_state; + trace_power_switch_state(POWER_SSTATE, acpi_state, 0); + ACPI_FLUSH_CPU_CACHE(); /* Do arch specific saving of state. */ if (acpi_state == ACPI_STATE_S3) { int error = acpi_save_state_mem(); - if (error) + if (error) { + trace_power_switch_state(POWER_SSTATE, + ACPI_STATE_S0, 0); return error; + } } local_irq_save(flags); @@ -309,6 +316,8 @@ static int acpi_suspend_enter(suspend_st suspend_nvs_restore(); + trace_power_switch_state(POWER_SSTATE, ACPI_STATE_S0, 0); + return ACPI_SUCCESS(status) ? 0 : -EFAULT; }