From patchwork Wed Nov 9 19:05:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Pan X-Patchwork-Id: 9420103 X-Patchwork-Delegate: rui.zhang@intel.com 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 A1BAF601C0 for ; Wed, 9 Nov 2016 19:08:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9483D293C0 for ; Wed, 9 Nov 2016 19:08:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 898FA293C8; Wed, 9 Nov 2016 19:08:00 +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 D1C89293C0 for ; Wed, 9 Nov 2016 19:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831AbcKITHh (ORCPT ); Wed, 9 Nov 2016 14:07:37 -0500 Received: from mga03.intel.com ([134.134.136.65]:59248 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753252AbcKITHE (ORCPT ); Wed, 9 Nov 2016 14:07:04 -0500 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP; 09 Nov 2016 11:07:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,614,1473145200"; d="scan'208";a="29427241" Received: from icelake.jf.intel.com ([10.7.199.88]) by orsmga005.jf.intel.com with ESMTP; 09 Nov 2016 11:07:02 -0800 From: Jacob Pan To: LKML , Linux PM , Peter Zijlstra , Thomas Gleixner , Ingo Molnar Cc: Zhang Rui , Rafael Wysocki , "Chen, Yu C" , Sebastian Andrzej Siewior , Petr Mladek , Srinivas Pandruvada , Arjan van de Ven , Jacob Pan Subject: [PATCH 2/3] cpuidle: allow setting deepest idle Date: Wed, 9 Nov 2016 11:05:11 -0800 Message-Id: <1478718312-12847-3-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478718312-12847-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1478718312-12847-1-git-send-email-jacob.jun.pan@linux.intel.com> 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 When idle injection is used to cap power, we need to override governor's choice of idle states. This patch allows caller to select the deepest idle state on a CPU therefore achieve the maximum potential power saving. Signed-off-by: Jacob Pan --- drivers/cpuidle/cpuidle.c | 12 ++++++++++++ include/linux/cpuidle.h | 4 +++- kernel/sched/idle.c | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index c73207a..9ad45b3 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -97,6 +97,18 @@ static int find_deepest_state(struct cpuidle_driver *drv, return ret; } +/* Set the current cpu to use the deepest idle state, override governors */ +void cpuidle_use_deepest_state(bool enable) +{ + struct cpuidle_device *dev; + + preempt_disable(); + dev = cpuidle_get_device(); + dev->use_deepest_state = enable; + preempt_enable(); +} +EXPORT_SYMBOL_GPL(cpuidle_use_deepest_state); + #ifdef CONFIG_SUSPEND /** * cpuidle_find_deepest_state - Find the deepest available idle state. diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index bb31373..7f93c63 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -74,6 +74,7 @@ struct cpuidle_state { struct cpuidle_device { unsigned int registered:1; unsigned int enabled:1; + unsigned int use_deepest_state:1; unsigned int cpu; int last_residency; @@ -192,11 +193,12 @@ static inline struct cpuidle_driver *cpuidle_get_cpu_driver( static inline struct cpuidle_device *cpuidle_get_device(void) {return NULL; } #endif -#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_SUSPEND) +#if defined(CONFIG_CPU_IDLE) 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_use_deepest_state(bool enable); #else static inline int cpuidle_find_deepest_state(struct cpuidle_driver *drv, struct cpuidle_device *dev) diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index ffd9a83..fc65147 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -173,6 +173,9 @@ static void cpuidle_idle_call(void) next_state = cpuidle_find_deepest_state(drv, dev); call_cpuidle(drv, dev, next_state); + } else if (dev->use_deepest_state) { + next_state = cpuidle_find_deepest_state(drv, dev); + call_cpuidle(drv, dev, next_state); } else { /* * Ask the cpuidle framework to choose a convenient idle state.