f754a06e564c9c869f63e1289c13490b3f1e084bb710d5565a6aa6a9.patch

From 062719b3fb16f0dfc1d845b06ff72370f217cd25 Mon Sep 17 00:00:00 2001
From: Sameer Nanda <snanda@chromium.org>
Date: Fri, 8 Oct 2010 09:05:44 -0700
Subject: [PATCH] CHROMIUM: ACPI: Read TSC upon resume

Read the TSC upon resuming and print it out. This is useful
in helping figure out amount of time spent in the BIOS when
resuming from suspend.

Signed-off-by: Sameer Nanda <snanda@chromium.org>

(cherry picked from commit 7dee240d51c745d7e8300e136c52d8a4d0724ec4)

BUG=chromium-os:13590
TEST=powerd_suspend
Resume the system.
dmesg | grep "TSC at resume:"
Ensure that the tsc value is returned.

Change-Id: I7f4e3ffd7ba3f22c530512196920cb306bedb449
Signed-off-by: Benson Leung <bleung@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/19327
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Sameer Nanda <snanda@chromium.org>

[rebase419(groeck): As per upstream commit ea89c06548217,
 rdtscll() has been removed. Replace with rdtsc_ordered()]

Signed-off-by: Guenter Roeck <groeck@chromium.org>
Change-Id: I8286378c327367631da015c501995ee48c6763a0
---
 drivers/acpi/sleep.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 3023224515ab..8c705955d920 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -565,6 +565,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 	acpi_status status = AE_OK;
 	u32 acpi_state = acpi_target_sleep_state;
 	int error;
+	u64 tsc;
 
 	ACPI_FLUSH_CPU_CACHE();
 
@@ -581,6 +582,9 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 		error = acpi_suspend_lowlevel();
 		if (error)
 			return error;
+		tsc = rdtsc_ordered();
+		printk(KERN_INFO "TSC at resume: %llu\n",
+				(unsigned long long)tsc);
 		pr_info("Low-level resume complete\n");
 		pm_set_resume_via_firmware();
 		break;
-- 
2.32.0.93.g670b81a890-goog