From patchwork Fri Oct 4 08:32:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 175209 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp389355ill; Fri, 4 Oct 2019 01:32:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqypdf8PwbgI39jImqMfYec5HucLOoNhgOmBt6ZXMHv6HxMuDrMqHbiu9VaSL7nHtY5o2rqr X-Received: by 2002:a05:6402:1a45:: with SMTP id bf5mr13590018edb.275.1570177969458; Fri, 04 Oct 2019 01:32:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570177969; cv=none; d=google.com; s=arc-20160816; b=aXyKppOOOyrYLuaCQfA+C0W9Z65YlBQKXwF8Z68UcODjcA86CgSTnTf70M26ouPnrK KQRBhRmkSnV6WcFKb6/d4DeOtK8cGlvBd6xPa/AIikRF1CPql05aj5vRE+8Rz4V+rhSE JZHwPu5MjnQo3hT3xkr3AFslXcOocx91UllL3S6jFivk8BDoacQZ4rUb8FXqE6OwYvIU l26D3a0fYN9wtBVDTr3JnLoAxtSO7V6CUGBfXoNR7RD7w7fDH7kUTMFv4NjwhEzyAyCN wR3Dm1qb806f/TG0daxYrEBaENSaEqoM6p+oQpEQUVD68M4zBRf7EMRrsiCGZO8Cxga2 EWXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=uHtN2KXg7csKh0URhIaVh4s7+YGI4rv+4/HJKnQimAk=; b=0EldqLHdWZbo4m0sgF7+2ivUpz9m77bvke1kN7ON/iMVvZ5GT2OWaGP57m5Qf0KpKx goUMbvVZHYlHaZOro+CELveJNVJyNXVB2fpCGdzDXmcd0M9SkwlwRfG5T5wh/jH6OEL4 xI0pduBXwVXi+jfbnyx82pylXwgTidIvTcn4Ji6NBLZ/3yoHlG020TK52EYTSecuW4XM EFLBJtKoaL+L7j2xAr2U2QYepSx0Y9dtVOJz4BdmWEJyy8eDNFjDPkQglCBqOrhvKrJ1 HsUgm3p4r2XOJqU7Ij4Wp1AOLx0cOjWugYJKMvJm8RbJ/N9/A6BhqGbgLZqTbuqs+OAy Reqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="efZ/l09I"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h13si3016093edw.348.2019.10.04.01.32.49; Fri, 04 Oct 2019 01:32:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="efZ/l09I"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730691AbfJDIcq (ORCPT + 27 others); Fri, 4 Oct 2019 04:32:46 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:56150 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730489AbfJDIco (ORCPT ); Fri, 4 Oct 2019 04:32:44 -0400 Received: by mail-wm1-f66.google.com with SMTP id a6so4831207wma.5 for ; Fri, 04 Oct 2019 01:32:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uHtN2KXg7csKh0URhIaVh4s7+YGI4rv+4/HJKnQimAk=; b=efZ/l09IxEYYv4a/hJ1ShKs5ROhMTgZVYiI2UmVudReioN0INj79IdyA1YLTqaKjdU R85CI/nMyCs0pj2FYsyDGYgtbbS0ZzUdlkTaaw3shGGWavs/dJhOHpwSXNFQVl8QRNGz 3hE3o5PBHB4/mDthrTC9fMwBeMyo5/CJplg1nTwjIjWLIEDiiHGrD2GnmwvIzS3lUWOH 11dEBnrsnE6OcUesIY9VdGArID7bbpIT+gVsl4lB9DGhbtf8jebAwnBapV3aGwEFj5Je SicEA40oONMKb9WayHKe0YkOgYK470O0O2ZMKNJBrFTxYisie7jwoCkdJlfwe384b3Lc UgXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uHtN2KXg7csKh0URhIaVh4s7+YGI4rv+4/HJKnQimAk=; b=CB5pTuQJkx/XFUrstS6IqhD5ivJaGTHA4piWuQo+IlyCsnOAa9jnWtEHBq1sVEtQQi suRaYb8R/mTfEjtadAcgSjjUs94uP/4h5QQAco6kQOSA/H1dt81vGExztZklh3gB1KPV MDWXGlVzv/vD9Di7NOaMZKksNj7drvbD/wZIrI161N8qtzeKNqTeGOXpEaxKUgN7Xxzs RuGJVS959ojVFN2NcPUuMBbxyoiNFfP3qPuSGCZ6b3501LZHjbc01WgY3FUff9aTXY4P 19EitgjoNfQd2MmpYNLlDcxGM/+U/DCe8sfomHB/h/a7EBsc4sWBAjMthBeI6rsdGuZq dJZg== X-Gm-Message-State: APjAAAXR2Yi8DmMLlMBXEJnXRYFtYPXJaI51BUY7PGApGkV2zfkL7oEx LkHmgLO+VrqbQHJcumXXUrP7lg== X-Received: by 2002:a7b:cf0e:: with SMTP id l14mr10198941wmg.138.1570177961872; Fri, 04 Oct 2019 01:32:41 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:15f7:68ed:c037:86e6]) by smtp.gmail.com with ESMTPSA id 59sm6488304wrc.23.2019.10.04.01.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Oct 2019 01:32:41 -0700 (PDT) From: Daniel Lezcano To: rjw@rjwysocki.net Cc: Mathieu Poirier , Zhang Rui , Eduardo Valentin , Ingo Molnar , Peter Zijlstra , Greg Kroah-Hartman , Allison Randal , Luc Van Oostenryck , Thomas Gleixner , Amit Kucheria , Josh Poimboeuf , Nicholas Piggin , Jiri Kosina , linux-pm@vger.kernel.org (open list:CPU IDLE TIME MANAGEMENT FRAMEWORK), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V4 2/3] cpuidle: play_idle: Specify play_idle with an idle state Date: Fri, 4 Oct 2019 10:32:04 +0200 Message-Id: <20191004083205.29302-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191004083205.29302-1-daniel.lezcano@linaro.org> References: <20191004083205.29302-1-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, the play_idle function does not allow to tell which idle state we want to go. Improve this by passing the idle state as parameter to the function. Export cpuidle_find_deepest_state() symbol as it is used from the intel_powerclamp driver as a module. There is no functional changes, the cpuidle state is the deepest one. Signed-off-by: Daniel Lezcano Acked-by: Mathieu Poirier --- V4: - Add EXPORT_SYMBOL_GPL(cpuidle_find_deepest_state) for the intel_powerclamp driver when this one is compiled as a module V3: - Add missing cpuidle.h header --- drivers/cpuidle/cpuidle.c | 1 + drivers/powercap/idle_inject.c | 4 +++- drivers/thermal/intel/intel_powerclamp.c | 4 +++- include/linux/cpu.h | 2 +- kernel/sched/idle.c | 4 ++-- 5 files changed, 10 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index f8b54f277589..94804e532b9a 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -126,6 +126,7 @@ int cpuidle_find_deepest_state(void) return find_deepest_state(drv, dev, UINT_MAX, 0, false); } +EXPORT_SYMBOL_GPL(cpuidle_find_deepest_state); #ifdef CONFIG_SUSPEND static void enter_s2idle_proper(struct cpuidle_driver *drv, diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index cd1270614cc6..233c878cbf46 100644 --- a/drivers/powercap/idle_inject.c +++ b/drivers/powercap/idle_inject.c @@ -38,6 +38,7 @@ #define pr_fmt(fmt) "ii_dev: " fmt #include +#include #include #include #include @@ -138,7 +139,8 @@ static void idle_inject_fn(unsigned int cpu) */ iit->should_run = 0; - play_idle(READ_ONCE(ii_dev->idle_duration_us)); + play_idle(READ_ONCE(ii_dev->idle_duration_us), + cpuidle_find_deepest_state()); } /** diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c index 53216dcbe173..b55786c169ae 100644 --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -430,7 +431,8 @@ static void clamp_idle_injection_func(struct kthread_work *work) if (should_skip) goto balance; - play_idle(jiffies_to_usecs(w_data->duration_jiffies)); + play_idle(jiffies_to_usecs(w_data->duration_jiffies), + cpuidle_find_deepest_state()); balance: if (clamping && w_data->clamping && cpu_online(w_data->cpu)) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 88dc0c653925..76e3038b63ce 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -179,7 +179,7 @@ void arch_cpu_idle_dead(void); int cpu_report_state(int cpu); int cpu_check_up_prepare(int cpu); void cpu_set_state_online(int cpu); -void play_idle(unsigned long duration_us); +void play_idle(unsigned long duration_us, int state); #ifdef CONFIG_HOTPLUG_CPU bool cpu_wait_death(unsigned int cpu, int seconds); diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c index 17da9cb309e1..ead439dab2b5 100644 --- a/kernel/sched/idle.c +++ b/kernel/sched/idle.c @@ -311,7 +311,7 @@ static enum hrtimer_restart idle_inject_timer_fn(struct hrtimer *timer) return HRTIMER_NORESTART; } -void play_idle(unsigned long duration_us) +void play_idle(unsigned long duration_us, int state) { struct idle_timer it; @@ -328,7 +328,7 @@ void play_idle(unsigned long duration_us) rcu_sleep_check(); preempt_disable(); current->flags |= PF_IDLE; - cpuidle_use_state(cpuidle_find_deepest_state()); + cpuidle_use_state(state); it.done = 0; hrtimer_init_on_stack(&it.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);