From patchwork Thu Jun 9 03:08:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Basehore X-Patchwork-Id: 9166159 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 22A6C60890 for ; Thu, 9 Jun 2016 03:09:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 189C22656B for ; Thu, 9 Jun 2016 03:09:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D63B2766D; Thu, 9 Jun 2016 03:09:42 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham 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 4EF1B2824F for ; Thu, 9 Jun 2016 03:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933060AbcFIDJk (ORCPT ); Wed, 8 Jun 2016 23:09:40 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36583 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933857AbcFIDJI (ORCPT ); Wed, 8 Jun 2016 23:09:08 -0400 Received: by mail-pa0-f41.google.com with SMTP id b5so8254944pas.3 for ; Wed, 08 Jun 2016 20:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AGNdoMIyZ8isw3Mbb4dtnq+Ga91VFLKFEbjkW6rtHs0=; b=iZyogGpzoux7fIzQBptbmcjrn3pP20GXXkZZSUyTnbqUeCUTEpmAmTdIdiqJTSLzQ3 iU9TMRbV9b8z00mEWLSdT75Ztu5DhlGeiUFT+OgyxzNJ0eDJNxM8j/+4vBylhnLKRiAs LwNZk7+2lev7SYLPaxP45VTj/qlLqQKyzcI7k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AGNdoMIyZ8isw3Mbb4dtnq+Ga91VFLKFEbjkW6rtHs0=; b=Fo1ROOkw/bl5guqyJfeTP66oyfylj0s6Rb6fg43Shzm/GgOQztnGdSGKbtyjr67mwv 4+fMjpNmdSxdqV9zJ2H1pEfrNX5JtqwkHJ3enyO+1KtwKrRuvrBHRJ1d/1EiU2+WcPc0 lI/hhJ80Em6HG5KpuoVwLLOVJyhRHVSZbtxwGrQXN70KAD4mKM0E+t6518gjUm20IGkg O8TiXSJ06wtZl6X19UWZqsiciRgyoVlYG5092iYk1Wzy7KXfEig18Qf2GsB0TlI3WDBz mqv58+Yz5JwchQXx8PGrs+2RDCi799iZS0uTdi07dWPgQzSRPz9u6ZP8btKn6wpG5+WO jtxg== X-Gm-Message-State: ALyK8tJYKaAbtXwp6/lEhCCor0VckgfpZYLndEXX1w5eiBBp6PW5OuuhxHRmnI0dtpzdlyq6 X-Received: by 10.66.220.33 with SMTP id pt1mr9394531pac.120.1465441747346; Wed, 08 Jun 2016 20:09:07 -0700 (PDT) Received: from ketosis.mtv.corp.google.com ([172.22.65.104]) by smtp.gmail.com with ESMTPSA id b186sm5482186pfa.61.2016.06.08.20.09.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 20:09:06 -0700 (PDT) From: dbasehore@chromium.org To: linux-kernel@vger.kernel.org Cc: dbasehore@chromium.org, linux-pm@vger.kernel.org, rjw@rjwysocki.net, pavel@ucw.cz, len.brown@intel.com, tglx@linutronix.de, gnomes@lxorguk.ukuu.org.uk, peterz@infradead.org Subject: [PATCH v3 4/5] freeze: Add error reporting Date: Wed, 8 Jun 2016 20:08:57 -0700 Message-Id: <1465441738-7972-5-git-send-email-dbasehore@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1465441738-7972-1-git-send-email-dbasehore@chromium.org> References: <1465441738-7972-1-git-send-email-dbasehore@chromium.org> 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: Derek Basehore This adds error reporting for cpuidle to freeze so suspend-to-idle can report errors when the CPU/SoC is unable to idle properly. Freeze will abort when an error is encounted. Signed-off-by: Derek Basehore --- drivers/acpi/processor_idle.c | 10 ++++++---- drivers/cpuidle/cpuidle.c | 31 ++++++++++++++++++++++++++----- drivers/idle/intel_idle.c | 8 +++++--- include/linux/cpuidle.h | 12 ++++++++---- kernel/power/suspend.c | 11 +++++++---- 5 files changed, 52 insertions(+), 20 deletions(-) diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 444e374..a959b32 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -783,8 +783,8 @@ static int acpi_idle_enter(struct cpuidle_device *dev, return index; } -static void acpi_idle_enter_freeze(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static int acpi_idle_enter_freeze(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); @@ -792,16 +792,18 @@ static void acpi_idle_enter_freeze(struct cpuidle_device *dev, struct acpi_processor *pr = __this_cpu_read(processors); if (unlikely(!pr)) - return; + return 0; if (pr->flags.bm_check) { acpi_idle_enter_bm(pr, cx, false); - return; + return 0; } else { ACPI_FLUSH_CPU_CACHE(); } } acpi_idle_do_entry(cx); + + return 0; } struct cpuidle_driver acpi_idle_driver = { diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index a4d0059..45bbaf7 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -34,6 +34,7 @@ LIST_HEAD(cpuidle_detected_devices); static int enabled_devices; static int off __read_mostly; static int initialized __read_mostly; +static int cpuidle_freeze_error; int cpuidle_disabled(void) { @@ -109,9 +110,11 @@ int cpuidle_find_deepest_state(struct cpuidle_driver *drv, return find_deepest_state(drv, dev, UINT_MAX, 0, false); } -static void enter_freeze_proper(struct cpuidle_driver *drv, +static int enter_freeze_proper(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index) { + int ret; + /* * trace_suspend_resume() called by tick_freeze() for the last CPU * executing it contains RCU usage regarded as invalid in the idle @@ -124,7 +127,7 @@ static void enter_freeze_proper(struct cpuidle_driver *drv, * suspended is generally unsafe. */ stop_critical_timings(); - drv->states[index].enter_freeze(dev, drv, index); + ret = drv->states[index].enter_freeze(dev, drv, index); WARN_ON(!irqs_disabled()); /* * timekeeping_resume() that will be called by tick_unfreeze() for the @@ -133,6 +136,7 @@ static void enter_freeze_proper(struct cpuidle_driver *drv, */ RCU_NONIDLE(tick_unfreeze()); start_critical_timings(); + return ret; } /** @@ -145,7 +149,7 @@ static void enter_freeze_proper(struct cpuidle_driver *drv, */ int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev) { - int index; + int index, ret = 0; /* * Find the deepest state with ->enter_freeze present, which guarantees @@ -153,11 +157,28 @@ int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev) * be frozen safely. */ index = find_deepest_state(drv, dev, UINT_MAX, 0, true); - if (index > 0) - enter_freeze_proper(drv, dev, index); + if (index >= 0) + ret = enter_freeze_proper(drv, dev, index); + + if (ret < 0) { + cpuidle_freeze_error = ret; + freeze_wake(); + } return index; } + +void cpuidle_prepare_freeze(void) +{ + cpuidle_freeze_error = 0; + cpuidle_resume(); +} + +int cpuidle_complete_freeze(void) +{ + cpuidle_pause(); + return cpuidle_freeze_error; +} #endif /* CONFIG_SUSPEND */ /** diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index c966492..98565de 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -97,8 +97,8 @@ static const struct idle_cpu *icpu; static struct cpuidle_device __percpu *intel_idle_cpuidle_devices; static int intel_idle(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index); -static void intel_idle_freeze(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index); +static int intel_idle_freeze(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index); static int intel_idle_cpu_init(int cpu); static struct cpuidle_state *cpuidle_state_table; @@ -870,13 +870,15 @@ static int intel_idle(struct cpuidle_device *dev, * @drv: cpuidle driver * @index: state index */ -static void intel_idle_freeze(struct cpuidle_device *dev, +static int intel_idle_freeze(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index) { unsigned long ecx = 1; /* break on interrupt flag */ unsigned long eax = flg2MWAIT(drv->states[index].flags); mwait_idle_with_hints(eax, ecx); + + return 0; } static void __setup_broadcast_timer(void *arg) diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 786ad32..2309849 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -54,11 +54,11 @@ struct cpuidle_state { /* * CPUs execute ->enter_freeze with the local tick or entire timekeeping * suspended, so it must not re-enable interrupts at any point (even - * temporarily) or attempt to change states of clock event devices. + * temporarily). Returns 0 on success and non-zero if an error occurred. */ - void (*enter_freeze) (struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index); + int (*enter_freeze) (struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index); }; /* Idle State Flags */ @@ -194,6 +194,8 @@ extern int cpuidle_find_deepest_state(struct cpuidle_driver *drv, struct cpuidle_device *dev); extern int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev); +extern void cpuidle_prepare_freeze(void); +extern int cpuidle_complete_freeze(void); #else static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, struct cpuidle_device *dev) @@ -201,6 +203,8 @@ static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, static inline int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev) {return -ENODEV; } +static inline void cpuidle_prepare_freeze(void) { } +static inline int cpuidle_complete_freeze(void) { return -ENODEV; } #endif /* kernel/sched/idle.c */ diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 5b70d64..419154b 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -57,8 +57,10 @@ static void freeze_begin(void) suspend_freeze_state = FREEZE_STATE_NONE; } -static void freeze_enter(void) +static int freeze_enter(void) { + int error = 0; + spin_lock_irq(&suspend_freeze_lock); if (pm_wakeup_pending()) goto out; @@ -67,7 +69,7 @@ static void freeze_enter(void) spin_unlock_irq(&suspend_freeze_lock); get_online_cpus(); - cpuidle_resume(); + cpuidle_prepare_freeze(); /* Push all the CPUs into the idle loop. */ wake_up_all_idle_cpus(); @@ -77,7 +79,7 @@ static void freeze_enter(void) suspend_freeze_state == FREEZE_STATE_WAKE); pr_debug("PM: resume from suspend-to-idle\n"); - cpuidle_pause(); + error = cpuidle_complete_freeze(); put_online_cpus(); spin_lock_irq(&suspend_freeze_lock); @@ -85,6 +87,7 @@ static void freeze_enter(void) out: suspend_freeze_state = FREEZE_STATE_NONE; spin_unlock_irq(&suspend_freeze_lock); + return error; } void freeze_wake(void) @@ -347,7 +350,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) */ if (state == PM_SUSPEND_FREEZE) { trace_suspend_resume(TPS("machine_suspend"), state, true); - freeze_enter(); + error = freeze_enter(); trace_suspend_resume(TPS("machine_suspend"), state, false); goto Platform_wake; }