From patchwork Wed Dec 11 22:43:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 181353 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp113911ile; Wed, 11 Dec 2019 14:44:09 -0800 (PST) X-Google-Smtp-Source: APXvYqyiH9qIbjmry2ZW7aGNnNySpJPKPQH5a6IIiXqwr6KfWn7rn3aJoPIp53QKV1pWc/ZPUyTD X-Received: by 2002:a05:6830:12cf:: with SMTP id a15mr4452601otq.222.1576104249034; Wed, 11 Dec 2019 14:44:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576104249; cv=none; d=google.com; s=arc-20160816; b=n7VRD2XXB9ioJ2/fcoyM/MzwOLdmy/axtzrnWqfYVR5pWYgD/dwAjT0Hr6rLH4FGgT DnXN3WDqE8kICH5GqBjoQmmWdbg6Svf9/BNp8jCKaKYyVAdZjVS2lfFE4SI+tsY9G4SD A5GGl5tyqlq3UBxKDaSNGh9qvP9QM5iYRhcInadHUoNu1iCMnCXOgltOfftmlMhHhIyq AwvvRU0z3Fl0TL50MNbKC4hI0hwDLib6MyEQG8N37W8Tr4HhiX8aeSE8UGdw0uab4+/N v9pLoCylGuMkLP7/KLdqocfOBTcBa9jTnBKZB2J0s7ZCZF4SLDlgbxib8aqQUaYfB4ai QJhQ== 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=oAzC/EfkZfCVAANByWBicvaD1NtxzDGBrkTMONT5Q7I=; b=VLZtPBvLKm1IUu8gSQf6orrCLh8xNfPrxhv5OSYwVbpgFgMmV7T15br8ENR4K8K3DP N88XAHVs1VlbZpe0GNhY/u2Efu7eAS4BPSIKIdwV3n7nnNxvxzMJx1N6ENPv6KmRECbT Xq+mjgUTZjn//W4QE3rdhmeOOSkuo4KeGN9DH4Z9BuV7BWY1nJqym2lUvC+7WYmUH6+3 qgquZlhmNDnKxfB4m4it7u2HEuoNAuqQePBlsZLnB++NzFrwq12HlTD0PsMONGiHH0RT bRtlKetR7xQYR0L+eK6Lja/J++BYg2Qg21lACC+6DexZCr4+UqnXp6ylAPCHdLsxSEKq XTpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V0+3fW+E; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 l5si2024983otr.255.2019.12.11.14.44.08; Wed, 11 Dec 2019 14:44:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=V0+3fW+E; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1726595AbfLKWoG (ORCPT + 10 others); Wed, 11 Dec 2019 17:44:06 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54779 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726676AbfLKWoG (ORCPT ); Wed, 11 Dec 2019 17:44:06 -0500 Received: by mail-wm1-f67.google.com with SMTP id b11so85009wmj.4 for ; Wed, 11 Dec 2019 14:44:03 -0800 (PST) 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=oAzC/EfkZfCVAANByWBicvaD1NtxzDGBrkTMONT5Q7I=; b=V0+3fW+E3z2PsIOwM0n8UQYIfcziCodBuCtFvz2jFDer10XE8U8v5em1UTp0dWjBoj ltRJZhypXpQSWXvIihBQEpKOb0sdg/JbbNt8cuF5HtYQ37O9vehobMb/6igdlbmd+Xob yfY0rb7NzzaXrPo4oNzfd9FoWuzkVaz1PAs/gaWFx7v7BKK4qq/Vs2kD8yx23vIA4zNE Yle429p85jH2qSOrS0TuLyPBEuUxYN4q2C/9Uxw2Fi+7bnPn+TcyEmT4XjDNhe/ASKUo REtatKacDZRrc0+hIiYcFKDgH3uif7p4obDFbQiVUgWFuFQ7eirf63bU+BrlPUwXIsEm fmNQ== 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=oAzC/EfkZfCVAANByWBicvaD1NtxzDGBrkTMONT5Q7I=; b=XC/QGGnZu0a5EONtASRch9ZQNwzAw1tNYhakvcfHPT7wmahPKKeZWPG0gn8MGZam3u gcEiFCzdv6QMO079E2zLKWE4qhRBn336zV999lxeAOii2JfcJ894OZgkJ+6f+V9PpR1o ytruarSg5BvgCfJ9ADLSwP6YThp351o3330MjC8oqotPfGnQ+iKuisE0IDbUkFY6Tz7O W3KYtNN1rbHk6lhjo1ThasQ7yeQgPY70Xjq1zU3RCPnB8NtPUayS9SFOnVy6m+Xej3U7 4PouXSowubNmhkps4mHEpDDteDj0/+3W0qlU5JK9h3sdUwWRYzE0zXvZNkuRikANZE+n INYA== X-Gm-Message-State: APjAAAWUFUc0V/cLxI8c1h6ORJb2wEmqGYlVGels4hD3Dezk/UvctBpz IbPZLLajeJjvuJphbwhn0ZFfHg== X-Received: by 2002:a05:600c:54c:: with SMTP id k12mr2503767wmc.124.1576104242642; Wed, 11 Dec 2019 14:44:02 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:48f7:48fb:71cb:f13a]) by smtp.gmail.com with ESMTPSA id s16sm3798809wrn.78.2019.12.11.14.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 14:44:02 -0800 (PST) From: Daniel Lezcano To: rui.zhang@intel.com Cc: rjw@rjwysocki.net, linux-pm@vger.kernel.org, viresh.kumar@linaro.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org, martin.kepplinger@puri.sm Subject: [PATCH V5 2/3] thermal/drivers/cpu_cooling: Introduce the cpu idle cooling driver Date: Wed, 11 Dec 2019 23:43:46 +0100 Message-Id: <20191211224347.1001-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211224347.1001-1-daniel.lezcano@linaro.org> References: <20191211224347.1001-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The cpu idle cooling device offers a new method to cool down a CPU by injecting idle cycles at runtime. It has some similarities with the intel power clamp driver but it is actually designed to be more generic and relying on the idle injection powercap framework. The idle injection duration is fixed while the running duration is variable. That allows to have control on the device reactivity for the user experience. An idle state powering down the CPU or the cluster will allow to drop the static leakage, thus restoring the heat capacity of the SoC. It can be set with a trip point between the hot and the critical points, giving the opportunity to prevent a hard reset of the system when the cpufreq cooling fails to cool down the CPU. With more sophisticated boards having a per core sensor, the idle cooling device allows to cool down a single core without throttling the compute capacity of several cpus belonging to the same clock line, so it could be used in collaboration with the cpufreq cooling device. Signed-off-by: Daniel Lezcano Acked-by: Viresh Kumar --- V5: - Fixed NULL pointer check from idle_inject_register - Fixed invalid zero value passed to idle_inject_set_duration V4: - Fixed typos in the kernel-doc and clarified the changelog (Amit Kucheria) V3: - Add missing parameter documentation (Viresh Kumar) - Fixed function description (Viresh Kumar) - Add entry in MAINTAINER file V2: - Remove idle_duration_us field and use idle_inject API instead (Viresh Kumar) - Fixed function definition wheh CPU_IDLE_COOLING is not set - Inverted the initialization in the init function (Viresh Kumar) --- MAINTAINERS | 3 + drivers/thermal/Kconfig | 7 + drivers/thermal/Makefile | 1 + drivers/thermal/cpuidle_cooling.c | 234 ++++++++++++++++++++++++++++++ include/linux/cpu_cooling.h | 22 +++ 5 files changed, 267 insertions(+) create mode 100644 drivers/thermal/cpuidle_cooling.c -- 2.17.1 Tested-by: Martin Kepplinger diff --git a/MAINTAINERS b/MAINTAINERS index bd5847e802de..d92e9eb14131 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16330,12 +16330,15 @@ F: Documentation/devicetree/bindings/thermal/ THERMAL/CPU_COOLING M: Amit Daniel Kachhap +M: Daniel Lezcano M: Viresh Kumar M: Javi Merino L: linux-pm@vger.kernel.org S: Supported F: Documentation/driver-api/thermal/cpu-cooling-api.rst +F: Documentation/driver-api/thermal/cpu-idle-cooling.rst F: drivers/thermal/cpu_cooling.c +F: drivers/thermal/cpuidle_cooling.c F: include/linux/cpu_cooling.h THERMAL DRIVER FOR AMLOGIC SOCS diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 702b33dcdb35..0d93c652014f 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -170,6 +170,13 @@ config CPU_FREQ_THERMAL This will be useful for platforms using the generic thermal interface and not the ACPI interface. +config CPU_IDLE_THERMAL + bool "CPU idle cooling device" + depends on IDLE_INJECT + help + This implements the CPU cooling mechanism through + idle injection. This will throttle the CPU by injecting + idle cycle. endif config CLOCK_THERMAL diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 3f3533c01aa3..6929e6fad1ac 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -20,6 +20,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_POWER_ALLOCATOR) += power_allocator.o # cpufreq cooling thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpu_cooling.o +thermal_sys-$(CONFIG_CPU_IDLE_THERMAL) += cpuidle_cooling.o # clock cooling thermal_sys-$(CONFIG_CLOCK_THERMAL) += clock_cooling.o diff --git a/drivers/thermal/cpuidle_cooling.c b/drivers/thermal/cpuidle_cooling.c new file mode 100644 index 000000000000..46932d1bd7e5 --- /dev/null +++ b/drivers/thermal/cpuidle_cooling.c @@ -0,0 +1,234 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 Linaro Limited. + * + * Author: Daniel Lezcano + * + */ +#include +#include +#include +#include +#include +#include +#include + +/** + * struct cpuidle_cooling_device - data for the idle cooling device + * @ii_dev: an atomic to keep track of the last task exiting the idle cycle + * @state: a normalized integer giving the state of the cooling device + */ +struct cpuidle_cooling_device { + struct idle_inject_device *ii_dev; + unsigned long state; +}; + +static DEFINE_IDA(cpuidle_ida); + +/** + * cpuidle_cooling_runtime - Running time computation + * @idle_duration_us: the idle cooling device + * @state: a percentile based number + * + * The running duration is computed from the idle injection duration + * which is fixed. If we reach 100% of idle injection ratio, that + * means the running duration is zero. If we have a 50% ratio + * injection, that means we have equal duration for idle and for + * running duration. + * + * The formula is deduced as follows: + * + * running = idle x ((100 / ratio) - 1) + * + * For precision purpose for integer math, we use the following: + * + * running = (idle x 100) / ratio - idle + * + * For example, if we have an injected duration of 50%, then we end up + * with 10ms of idle injection and 10ms of running duration. + * + * Return: An unsigned int for a usec based runtime duration. + */ +static unsigned int cpuidle_cooling_runtime(unsigned int idle_duration_us, + unsigned long state) +{ + if (!state) + return 0; + + return ((idle_duration_us * 100) / state) - idle_duration_us; +} + +/** + * cpuidle_cooling_get_max_state - Get the maximum state + * @cdev : the thermal cooling device + * @state : a pointer to the state variable to be filled + * + * The function always returns 100 as the injection ratio. It is + * percentile based for consistency accross different platforms. + * + * Return: The function can not fail, it is always zero + */ +static int cpuidle_cooling_get_max_state(struct thermal_cooling_device *cdev, + unsigned long *state) +{ + /* + * Depending on the configuration or the hardware, the running + * cycle and the idle cycle could be different. We want to + * unify that to an 0..100 interval, so the set state + * interface will be the same whatever the platform is. + * + * The state 100% will make the cluster 100% ... idle. A 0% + * injection ratio means no idle injection at all and 50% + * means for 10ms of idle injection, we have 10ms of running + * time. + */ + *state = 100; + + return 0; +} + +/** + * cpuidle_cooling_get_cur_state - Get the current cooling state + * @cdev: the thermal cooling device + * @state: a pointer to the state + * + * The function just copies the state value from the private thermal + * cooling device structure, the mapping is 1 <-> 1. + * + * Return: The function can not fail, it is always zero + */ +static int cpuidle_cooling_get_cur_state(struct thermal_cooling_device *cdev, + unsigned long *state) +{ + struct cpuidle_cooling_device *idle_cdev = cdev->devdata; + + *state = idle_cdev->state; + + return 0; +} + +/** + * cpuidle_cooling_set_cur_state - Set the current cooling state + * @cdev: the thermal cooling device + * @state: the target state + * + * The function checks first if we are initiating the mitigation which + * in turn wakes up all the idle injection tasks belonging to the idle + * cooling device. In any case, it updates the internal state for the + * cooling device. + * + * Return: The function can not fail, it is always zero + */ +static int cpuidle_cooling_set_cur_state(struct thermal_cooling_device *cdev, + unsigned long state) +{ + struct cpuidle_cooling_device *idle_cdev = cdev->devdata; + struct idle_inject_device *ii_dev = idle_cdev->ii_dev; + unsigned long current_state = idle_cdev->state; + unsigned int runtime_us, idle_duration_us; + + idle_cdev->state = state; + + idle_inject_get_duration(ii_dev, &runtime_us, &idle_duration_us); + + runtime_us = cpuidle_cooling_runtime(idle_duration_us, state); + + idle_inject_set_duration(ii_dev, runtime_us, idle_duration_us); + + if (current_state == 0 && state > 0) { + idle_inject_start(ii_dev); + } else if (current_state > 0 && !state) { + idle_inject_stop(ii_dev); + } + + return 0; +} + +/** + * cpuidle_cooling_ops - thermal cooling device ops + */ +static struct thermal_cooling_device_ops cpuidle_cooling_ops = { + .get_max_state = cpuidle_cooling_get_max_state, + .get_cur_state = cpuidle_cooling_get_cur_state, + .set_cur_state = cpuidle_cooling_set_cur_state, +}; + +/** + * cpuidle_of_cooling_register - Idle cooling device initialization function + * @drv: a cpuidle driver structure pointer + * @np: a node pointer to a device tree cooling device node + * + * This function is in charge of creating a cooling device per cpuidle + * driver and register it to thermal framework. + * + * Return: A valid pointer to a thermal cooling device or a PTR_ERR + * corresponding to the error detected in the underlying subsystems. + */ +struct thermal_cooling_device * +__init cpuidle_of_cooling_register(struct device_node *np, + struct cpuidle_driver *drv) +{ + struct idle_inject_device *ii_dev; + struct cpuidle_cooling_device *idle_cdev; + struct thermal_cooling_device *cdev; + char dev_name[THERMAL_NAME_LENGTH]; + int id, ret; + + idle_cdev = kzalloc(sizeof(*idle_cdev), GFP_KERNEL); + if (!idle_cdev) { + ret = -ENOMEM; + goto out; + } + + id = ida_simple_get(&cpuidle_ida, 0, 0, GFP_KERNEL); + if (id < 0) { + ret = id; + goto out_kfree; + } + + ii_dev = idle_inject_register(drv->cpumask); + if (!ii_dev) { + ret = -EINVAL; + goto out_id; + } + + idle_inject_set_duration(ii_dev, TICK_USEC, TICK_USEC); + + idle_cdev->ii_dev = ii_dev; + + snprintf(dev_name, sizeof(dev_name), "thermal-idle-%d", id); + + cdev = thermal_of_cooling_device_register(np, dev_name, idle_cdev, + &cpuidle_cooling_ops); + if (IS_ERR(cdev)) { + ret = PTR_ERR(cdev); + goto out_unregister; + } + + return cdev; + +out_unregister: + idle_inject_unregister(ii_dev); +out_id: + ida_simple_remove(&cpuidle_ida, id); +out_kfree: + kfree(idle_cdev); +out: + return ERR_PTR(ret); +} + +/** + * cpuidle_cooling_register - Idle cooling device initialization function + * @drv: a cpuidle driver structure pointer + * + * This function is in charge of creating a cooling device per cpuidle + * driver and register it to thermal framework. + * + * Return: A valid pointer to a thermal cooling device, a PTR_ERR + * corresponding to the error detected in the underlying subsystems. + */ +struct thermal_cooling_device * +__init cpuidle_cooling_register(struct cpuidle_driver *drv) +{ + return cpuidle_of_cooling_register(NULL, drv); +} diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 3cdd85f987d7..da0970183d1f 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -60,4 +60,26 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) } #endif /* CONFIG_CPU_FREQ_THERMAL */ +struct cpuidle_driver; + +#ifdef CONFIG_CPU_IDLE_THERMAL +extern struct thermal_cooling_device * +__init cpuidle_cooling_register(struct cpuidle_driver *drv); +extern struct thermal_cooling_device * +__init cpuidle_of_cooling_register(struct device_node *np, + struct cpuidle_driver *drv); +#else /* CONFIG_CPU_IDLE_THERMAL */ +static inline struct thermal_cooling_device * +__init cpuidle_cooling_register(struct cpuidle_driver *drv) +{ + return ERR_PTR(-EINVAL); +} +static inline struct thermal_cooling_device * +__init cpuidle_of_cooling_register(struct device_node *np, + struct cpuidle_driver *drv) +{ + return ERR_PTR(-EINVAL); +} +#endif /* CONFIG_CPU_IDLE_THERMAL */ + #endif /* __CPU_COOLING_H__ */