From patchwork Tue Mar 12 01:21:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 2252491 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3AE00DF5B1 for ; Tue, 12 Mar 2013 01:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754616Ab3CLBVp (ORCPT ); Mon, 11 Mar 2013 21:21:45 -0400 Received: from mga02.intel.com ([134.134.136.20]:32015 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754591Ab3CLBVp (ORCPT ); Mon, 11 Mar 2013 21:21:45 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 11 Mar 2013 18:21:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,827,1355126400"; d="scan'208,223";a="299594476" Received: from unknown (HELO [10.255.20.110]) ([10.255.20.110]) by orsmga002.jf.intel.com with ESMTP; 11 Mar 2013 18:21:43 -0700 Message-ID: <1363051299.2291.100.camel@rzhang1-mobl4> Subject: [PATCH RESEND 1/2] PM: add TEST_PLATFORM support for freeze state From: Zhang Rui To: "Rafael J. Wysocki" Cc: Linux PM list , Kristen Carlson Accardi Date: Tue, 12 Mar 2013 09:21:39 +0800 X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From 148f7df1678d8b017bff32197c8ef378dbd97531 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Tue, 12 Mar 2013 08:43:11 +0800 Subject: [PATCH RESEND 1/2] PM: add TEST_PLATFORM support for freeze state Invoke freeze_enter() after suspend_test(TEST_PLATFORM) being invoked. So when setting /sys/power/pm_test to "platform", it can be used to check if freeze state is working well after all devices are suspended and before processors are blocked, Signed-off-by: Zhang Rui --- kernel/power/suspend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index d4feda0..5eb30aa 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -184,6 +184,9 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) goto Platform_wake; } + if (suspend_test(TEST_PLATFORM)) + goto Platform_wake; + /* * PM_SUSPEND_FREEZE equals * frozen processes + suspended devices + idle processors. @@ -195,9 +198,6 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) goto Platform_wake; } - if (suspend_test(TEST_PLATFORM)) - goto Platform_wake; - error = disable_nonboot_cpus(); if (error || suspend_test(TEST_CPUS)) goto Enable_cpus;