From patchwork Wed Jul 19 00:39:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 9850217 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3CACF60392 for ; Wed, 19 Jul 2017 00:51:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CC1A2624A for ; Wed, 19 Jul 2017 00:51:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21CDA285DA; Wed, 19 Jul 2017 00:51:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A04E32624A for ; Wed, 19 Jul 2017 00:51:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412AbdGSAvC (ORCPT ); Tue, 18 Jul 2017 20:51:02 -0400 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:43235 "EHLO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbdGSAvA (ORCPT ); Tue, 18 Jul 2017 20:51:00 -0400 Received: from 79.184.253.199.ipv4.supernova.orange.pl (79.184.253.199) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.82) id c8f9375a5f94167f; Wed, 19 Jul 2017 02:50:59 +0200 From: "Rafael J. Wysocki" To: Linux PM Cc: LKML , Thomas Gleixner Subject: [PATCH 2/3] PM / sleep: Mark suspend/hibernation start and finish Date: Wed, 19 Jul 2017 02:39:58 +0200 Message-ID: <1528829.lXeqX43PVF@aspire.rjw.lan> User-Agent: KMail/4.14.10 (Linux/4.12.0-rc1+; KDE/4.14.9; x86_64; ; ) In-Reply-To: <2539550.y54cRb749c@aspire.rjw.lan> References: <2539550.y54cRb749c@aspire.rjw.lan> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rafael J. Wysocki Regardless of whether or not debug messages from the core system suspend/hibernation code are enabled, it is useful to know when system-wide transitions start and finish (or fail), so print "info" messages at these points. Signed-off-by: Rafael J. Wysocki --- kernel/power/hibernate.c | 8 ++++++++ kernel/power/suspend.c | 4 ++++ 2 files changed, 12 insertions(+) Index: linux-pm/kernel/power/hibernate.c =================================================================== --- linux-pm.orig/kernel/power/hibernate.c +++ linux-pm/kernel/power/hibernate.c @@ -692,6 +692,7 @@ int hibernate(void) goto Unlock; } + pr_info("Starting hibernation\n"); pm_prepare_console(); error = __pm_notifier_call_chain(PM_HIBERNATION_PREPARE, -1, &nr_calls); if (error) { @@ -762,6 +763,11 @@ int hibernate(void) atomic_inc(&snapshot_device_available); Unlock: unlock_system_sleep(); + if (error) + pr_info("Hibernation failed (%d)\n", error); + else + pr_info("System resume complete\n"); + return error; } @@ -868,6 +874,7 @@ static int software_resume(void) goto Unlock; } + pr_info("Starting resume from hibernation\n"); pm_prepare_console(); error = __pm_notifier_call_chain(PM_RESTORE_PREPARE, -1, &nr_calls); if (error) { @@ -884,6 +891,7 @@ static int software_resume(void) Finish: __pm_notifier_call_chain(PM_POST_RESTORE, nr_calls, NULL); pm_restore_console(); + pr_info("Resume from hibernation failed (%d)\n", error); atomic_inc(&snapshot_device_available); /* For success case, the suspend path will release the lock */ Unlock: Index: linux-pm/kernel/power/suspend.c =================================================================== --- linux-pm.orig/kernel/power/suspend.c +++ linux-pm/kernel/power/suspend.c @@ -579,12 +579,16 @@ int pm_suspend(suspend_state_t state) if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) return -EINVAL; + pr_info("PM: Starting system suspend (%s)\n", pm_states[state]); error = enter_state(state); if (error) { suspend_stats.fail++; dpm_save_failed_errno(error); + pr_info("PM: System suspend (%s) failed (%d)\n", + pm_states[state], error); } else { suspend_stats.success++; + pr_info("PM: System resume complete\n"); } return error; }