From patchwork Tue Dec 3 09:37:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 180715 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1266207ile; Tue, 3 Dec 2019 01:37:14 -0800 (PST) X-Google-Smtp-Source: APXvYqyPzOrqY7NWrA3je7WcPhg4fPxUPLuRjbItXdM8nFgvVW1hkYUEuwVIWxkTl/mgQboUrjRj X-Received: by 2002:aca:b702:: with SMTP id h2mr2908423oif.145.1575365834797; Tue, 03 Dec 2019 01:37:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575365834; cv=none; d=google.com; s=arc-20160816; b=bLvIxFXmPM/erBvoTT/GQr82G3BMYEIWPa7NwEhDFMBug0K5y4qd7Xm0PryiY/b9xx fU6kEJcaVFSPReVhSy8NYqf5QgFdy/iHXICDDegtVRfmUqYKQhedNfDDbgnYtE/JPhVB x4Sm5V1yIfKZflip3AnFYp6wBmUzC9pfMRcqfZZWTPeN5+edcp8gK6+mRcVzE3HUnRq6 G45ZZfBwDda8Fpal+7s0Oa6kYYL4ZG+QKX2izBoWOk0qEKGHH6pO13VURffgQPOEifp+ 0hhJ6Ab6HTdjHanCunpZMgGyDAwuHe+uE3qxM2mEK1JTYua3ASjpDO3ZK9WDF4v9Lpom lCfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=v9aPs/wpi2L5/d1FqkD06cZ03HNvyIimtXPANJEaaic=; b=AFJQYpEHL4GFIXAD1m0KXjbNycXFII/42apbfIc9f+AvGvFXUQIhLWXxILKaoaqHz+ ZQx9uuUkOfdkV1uvBBZAJVCudXVc+boX6mPCpx4o4W3kNoXkTSz9UMTJH0C3vvOPe9nv D71PQPklD/jagjyKmDQ3rs/ywjLLDWpN29Q3WWorUN6PJEuSBjvSJhgpD/THYg4FEAU1 Tu/Gs8tOgq8y42HCVJOYSQXBzJsuE74Dqp7JasAYrE4O1lUhrhZomd2qxaEKn5CjAWoT yXpvu6Ab2HGX6mZYhybw3XzUPlQHoocEMtXSbU3wgXCx0gsZTLW1O+BTs2ttShf43Nh/ dFRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UO5bhFxt; 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 s17si865017otr.155.2019.12.03.01.37.14; Tue, 03 Dec 2019 01:37:14 -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=UO5bhFxt; 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 S1726214AbfLCJhN (ORCPT + 10 others); Tue, 3 Dec 2019 04:37:13 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36167 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726074AbfLCJhN (ORCPT ); Tue, 3 Dec 2019 04:37:13 -0500 Received: by mail-wr1-f66.google.com with SMTP id z3so2789849wru.3 for ; Tue, 03 Dec 2019 01:37:12 -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; bh=v9aPs/wpi2L5/d1FqkD06cZ03HNvyIimtXPANJEaaic=; b=UO5bhFxtDW+Yhtt76FWIlSYlZjTVcz3TshtsNuRV/UPdlkYfWUpmJjmE9LchizUrZU wCdGmXa/c4WBeOrnh0ueMXSGy11K8bDqCYzH82FJgOzU/+xwDKU6+3aGexyCVbTyPGvm MjAOko08FJyTVOXFEnRG2vLiTcNIVYMhy6t1mfJeatE66cVYBhp73AjBOtLbRGBuGhWk kUqt51i6SfdlrIDmGX3khX6/Owm/uhw0zA3lMAJ4nr4y5xUeAJNzPLZMHE5xSvuGQdel 4/9lqadTADcsVtVAzqmM5Usco+DUDuQA5eU+XxItYOot0U3e8pWz3OyimG6G0PthVkmR 7/OA== 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; bh=v9aPs/wpi2L5/d1FqkD06cZ03HNvyIimtXPANJEaaic=; b=TKhKJfuOfhuYAwDPZ+/tLGuh6tUpltFmu5qius/fQ+4VmBTcRM2Y4HnENKuVV/o9Cj gpEKC5NZK+olbm984+w8HaUzBeqdkyholvfvvjUgwTiziEjDYSYOk1d5Zlk80RH63SvE ZLdEKSx+Hqv71wBvHhRL9BH0p7jw/T3X3vuXEK4LFLfcGqmtlK6o/e4RaAd2qkdwPSd5 TE/12HVm7/Y6GnQxO3PCbHruzeAABOqQJ3fXh1Ag1piO9D4x2KPugxW2PCrj9YBjjNUp mS1gGtLyj4O/PAFmaBzGekXcTLQFCtsRCETfVk6S8EdzElMK4gpp+599NMB9sUyP/jdX GsnQ== X-Gm-Message-State: APjAAAUS602ThXJzyZMk+orMuZ11anFaieCx4jdjvUs6BYnETUj1yT5x H3mUhMni+GiQfjtRBIDioIwIWA== X-Received: by 2002:adf:f1d0:: with SMTP id z16mr3903327wro.209.1575365831350; Tue, 03 Dec 2019 01:37:11 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:8196:cbcc:fb2c:4975]) by smtp.gmail.com with ESMTPSA id w13sm2935751wru.38.2019.12.03.01.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 01:37:10 -0800 (PST) From: Daniel Lezcano To: viresh.kumar@linaro.org, rui.zhang@intel.com Cc: rjw@rjwysocki.net, edubezval@gmail.com, linux-pm@vger.kernel.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 1/4] thermal/drivers/Kconfig: Convert the CPU cooling device to a choice Date: Tue, 3 Dec 2019 10:37:01 +0100 Message-Id: <20191203093704.7037-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The next changes will add a new way to cool down a CPU by injecting idle cycles. With the current configuration, a CPU cooling device is the cpufreq cooling device. As we want to add a new CPU cooling device, let's convert the CPU cooling to a choice giving a list of CPU cooling devices. At this point, there is obviously only one CPU cooling device. There is no functional changes. Signed-off-by: Daniel Lezcano Acked-by: Viresh Kumar --- V2: - Default CPU_FREQ_COOLING when CPU_THERMAL is set (Viresh Kumar) --- drivers/thermal/Kconfig | 14 ++++++++++++-- drivers/thermal/Makefile | 2 +- include/linux/cpu_cooling.h | 6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 001a21abcc28..4e3ee036938b 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -150,8 +150,18 @@ config THERMAL_GOV_POWER_ALLOCATOR config CPU_THERMAL bool "Generic cpu cooling support" - depends on CPU_FREQ depends on THERMAL_OF + help + Enable the CPU cooling features. If the system has no active + cooling device available, this option allows to use the CPU + as a cooling device. + +if CPU_THERMAL + +config CPU_FREQ_THERMAL + bool "CPU frequency cooling device" + depends on CPU_FREQ + default y help This implements the generic cpu cooling mechanism through frequency reduction. An ACPI version of this already exists @@ -159,7 +169,7 @@ config CPU_THERMAL This will be useful for platforms using the generic thermal interface and not the ACPI interface. - If you want this support, you should say Y here. +endif config CLOCK_THERMAL bool "Generic clock cooling support" diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 74a37c7f847a..d3b01cc96981 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -19,7 +19,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o thermal_sys-$(CONFIG_THERMAL_GOV_POWER_ALLOCATOR) += power_allocator.o # cpufreq cooling -thermal_sys-$(CONFIG_CPU_THERMAL) += cpu_cooling.o +thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpu_cooling.o # clock cooling thermal_sys-$(CONFIG_CLOCK_THERMAL) += clock_cooling.o diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index b74732535e4b..3cdd85f987d7 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -19,7 +19,7 @@ struct cpufreq_policy; -#ifdef CONFIG_CPU_THERMAL +#ifdef CONFIG_CPU_FREQ_THERMAL /** * cpufreq_cooling_register - function to create cpufreq cooling device. * @policy: cpufreq policy. @@ -40,7 +40,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); struct thermal_cooling_device * of_cpufreq_cooling_register(struct cpufreq_policy *policy); -#else /* !CONFIG_CPU_THERMAL */ +#else /* !CONFIG_CPU_FREQ_THERMAL */ static inline struct thermal_cooling_device * cpufreq_cooling_register(struct cpufreq_policy *policy) { @@ -58,6 +58,6 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) { return NULL; } -#endif /* CONFIG_CPU_THERMAL */ +#endif /* CONFIG_CPU_FREQ_THERMAL */ #endif /* __CPU_COOLING_H__ */ From patchwork Tue Dec 3 09:37:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 180718 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1266380ile; Tue, 3 Dec 2019 01:37:25 -0800 (PST) X-Google-Smtp-Source: APXvYqxnOXh+BmtIOOcYkGMhIfzIM144ZMudrafEwtlPsQL6PVAcwXa/XxyvJdi+AnkT9TNoEznG X-Received: by 2002:a9d:195:: with SMTP id e21mr2528778ote.5.1575365845631; Tue, 03 Dec 2019 01:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575365845; cv=none; d=google.com; s=arc-20160816; b=uiu/gCprnhZAfLTODim81rkKUlRiOGD+yoMugWIyrG6BURrwdqhPAhAGr/ULlK7OoG mst8+Y2Rm90BO1EGG2Iiup0KlCcrvWEDdw+q0o2QkaNJaVWp5doDRD52ysl6E8IsMeMl ykj4hjg0DShKPnQ6/F9UrIxTowYem38Cxf//uk+V6geap1fWR6t3KOAdfYpeeJVT4XzH 5XVIcILXshnegWuYHzilytCWQmB8Ry0ACO6cq+GXehDV9K/wU1kgsMRF6nNWnydAkk9O kPvkjfhCh6ZLeKjjeDkDJPDG1h7dO9QQQqcUM17qFu1r2rL6bnpLteEDyHrl7xB/060D MXyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oCN7pz3yAoKGoMLvmy5rlcCyhRV2qLjVV6V8OqEy5PE=; b=Mg5lsmAK1NPvvkt2leZyvA/+J/1aCVcrgRdhC1wegRSfff8OCalwg+1vsOwFOCJWrx 4qwI/XOOfTgrm+7SmSYGkcIog9l3SDVza0QP+WPHwjZrU2i5QyAQk2Bg6xceh9JyXDfN 0xWSxa1+u6yJ9PbCyB3TAHK04uTysg1xc/iZMG5F7W4ODirU+xlRALNY1UK8QrPQNQmm BwweOXFRiIMJZiICj5Th26rv5Ir/RMdzgv0yTenCmLM2BHGOuizFhsrfAobB1f7HLAb2 rFQ/oiIlftgYsXvtg5T0/CMQzJMchpRQvSo6PokPog3DYzQbawENRLhQCGkNY0njdOC8 71Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bgtK9Xky; 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 l67si1060382oih.221.2019.12.03.01.37.25; Tue, 03 Dec 2019 01:37:25 -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=bgtK9Xky; 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 S1726422AbfLCJhS (ORCPT + 10 others); Tue, 3 Dec 2019 04:37:18 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39446 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726195AbfLCJhP (ORCPT ); Tue, 3 Dec 2019 04:37:15 -0500 Received: by mail-wm1-f67.google.com with SMTP id s14so2638586wmh.4 for ; Tue, 03 Dec 2019 01:37:13 -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 :mime-version:content-transfer-encoding; bh=oCN7pz3yAoKGoMLvmy5rlcCyhRV2qLjVV6V8OqEy5PE=; b=bgtK9XkyFkP1bsI29YXYqdbMkGSQjyI28y6K/8WybibRvbWCTqShPJGZkU0YrzmoR3 9M8V6TtPnfjrvL6Xb2JHhWf6IoA41e+O2x40OgWnVmZvldHQq9uU9wGLCPI/SmTZ/d5E kmsPZNBRa5nsHt0v/zcRSGrcdQIBHl3wmOWpdySleKbqNmg+XFmG/dni+BVDE8SVtm6M wOj2ZyJDObQjH9R2l7qsdcuBqe1xIdy3w9zhZcHY001OCckQzUCuhcFOeu01uJYeQLci oRHmBFznR6KAwiOTh7VbR4GbzVP19nk5XFDRQ+GtUAoTcCoXv43aAMq8uASL4CO/M7RG CvhA== 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:mime-version:content-transfer-encoding; bh=oCN7pz3yAoKGoMLvmy5rlcCyhRV2qLjVV6V8OqEy5PE=; b=W6AJkOv9prvPiTuZDuhcH00fQWR3Y2xZdMt98DYg0QSjnBNDRkiX3MErM9qSw7/FZ6 BpAdc1xHg9em9vxANxYuAqtVgdIvAzo+T+cWVAHlRyMwC/novrilwWZ3Xf56iEFi2nMx quwUIKcrnBtyP2ZOKd4XkQJZChPqo6tXENnUXeQnu9+Pc9Ok4bjE8l19NMvlKKAaGV3G Uy6b+9bTecyuOaUw4rlhUDe4aeq3lhi/jnUMYG8Vr7U9bCb6AyLYNZzCe/34QG370OSL volu8xBB6iCFBvWMjbJo74oL+3xEw+7vtQ2aZob+OLK2g2t3pzEnXbf4doQ9I3WjHLmE 1aKA== X-Gm-Message-State: APjAAAVu2ATlUos7K7rv8MYK+RfdGY0GJAtF3uupzagGLGJm5Fz/+vbs V4cEYhs83BWAAemHsNbXjK3NZw== X-Received: by 2002:a7b:c19a:: with SMTP id y26mr32458430wmi.152.1575365832444; Tue, 03 Dec 2019 01:37:12 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:8196:cbcc:fb2c:4975]) by smtp.gmail.com with ESMTPSA id w13sm2935751wru.38.2019.12.03.01.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 01:37:11 -0800 (PST) From: Daniel Lezcano To: viresh.kumar@linaro.org, rui.zhang@intel.com Cc: rjw@rjwysocki.net, edubezval@gmail.com, linux-pm@vger.kernel.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 2/4] thermal/drivers/cpu_cooling: Add idle cooling device documentation Date: Tue, 3 Dec 2019 10:37:02 +0100 Message-Id: <20191203093704.7037-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203093704.7037-1-daniel.lezcano@linaro.org> References: <20191203093704.7037-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Provide some documentation for the idle injection cooling effect in order to let people to understand the rational of the approach for the idle injection CPU cooling device. Signed-off-by: Daniel Lezcano Acked-by: Viresh Kumar --- .../driver-api/thermal/cpu-idle-cooling.rst | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 Documentation/driver-api/thermal/cpu-idle-cooling.rst -- 2.17.1 diff --git a/Documentation/driver-api/thermal/cpu-idle-cooling.rst b/Documentation/driver-api/thermal/cpu-idle-cooling.rst new file mode 100644 index 000000000000..457cd9979ddb --- /dev/null +++ b/Documentation/driver-api/thermal/cpu-idle-cooling.rst @@ -0,0 +1,166 @@ + +Situation: +---------- + +Under certain circumstances a SoC can reach the maximum temperature +limit or is unable to stabilize the temperature around a temperature +control. When the SoC has to stabilize the temperature, the kernel can +act on a cooling device to mitigate the dissipated power. When the +maximum temperature is reached and to prevent a reboot or a shutdown, +a decision must be taken to reduce the temperature under the critical +threshold, that impacts the performance. + +Another situation is when the silicon reaches a certain temperature +which continues to increase even if the dynamic leakage is reduced to +its minimum by clock gating the component. The runaway phenomena will +continue with the static leakage and only powering down the component, +thus dropping the dynamic and static leakage will allow the component +to cool down. + +Last but not least, the system can ask for a specific power budget but +because of the OPP density, we can only choose an OPP with a power +budget lower than the requested one and underuse the CPU, thus losing +performances. In other words, one OPP under uses the CPU with a power +lesser than the power budget and the next OPP exceed the power budget, +an intermediate OPP could have been used if it were present. + +Solutions: +---------- + +If we can remove the static and the dynamic leakage for a specific +duration in a controlled period, the SoC temperature will +decrease. Acting at the idle state duration or the idle cycle +injection period, we can mitigate the temperature by modulating the +power budget. + +The Operating Performance Point (OPP) density has a great influence on +the control precision of cpufreq, however different vendors have a +plethora of OPP density, and some have large power gap between OPPs, +that will result in loss of performance during thermal control and +loss of power in other scenes. + +At a specific OPP, we can assume injecting idle cycle on all CPUs, +belonging to the same cluster, with a duration greater than the +cluster idle state target residency, we drop the static and the +dynamic leakage for this period (modulo the energy needed to enter +this state). So the sustainable power with idle cycles has a linear +relation with the OPP’s sustainable power and can be computed with a +coefficient similar to: + + Power(IdleCycle) = Coef x Power(OPP) + +Idle Injection: +--------------- + +The base concept of the idle injection is to force the CPU to go to an +idle state for a specified time each control cycle, it provides +another way to control CPU power and heat in addition to +cpufreq. Ideally, if all CPUs belonging to the same cluster, inject +their idle cycle synchronously, the cluster can reach its power down +state with a minimum power consumption and static leakage +drop. However, these idle cycles injection will add extra latencies as +the CPUs will have to wakeup from a deep sleep state. + + ^ + | + | + |------- ------- ------- + |_______|_____|_______|_____|_______|___________ + + <-----> + idle <----> + running + +With the fixed idle injection duration, we can give a value which is +an acceptable performance drop off or latency when we reach a specific +temperature and we begin to mitigate by varying the Idle injection +period. + +The mitigation begins with a maximum period value which decrease when +more cooling effect is requested. When the period duration is equal to +the idle duration, then we are in a situation the platform can’t +dissipate the heat enough and the mitigation fails. In this case the +situation is considered critical and there is nothing to do. The idle +injection duration must be changed by configuration and until we reach +the cooling effect, otherwise an additionnal cooling device must be +used or ultimately decrease the SoC performance by dropping the +highest OPP point of the SoC. + +The idle injection duration value must comply with the constraints: + +- It is lesser or equal to the latency we tolerate when the mitigation + begins. It is platform dependent and will depend on the user + experience, reactivity vs performance trade off we want. This value + should be specified. + +- It is greater than the idle state’s target residency we want to go + for thermal mitigation, otherwise we end up consuming more energy. + +Minimum period +-------------- + +The idle injection duration being fixed, it is obvious the minimum +period can’t be lesser than that, otherwise we will be scheduling the +idle injection task right before the idle injection duration is +complete, so waking up the CPU to put it asleep again. + +Maximum period +-------------- + +The maximum period is the initial period when the mitigation +begins. Theoretically when we reach the thermal trip point, we have to +sustain a specified power for specific temperature but at this time we +consume: + + Power = Capacitance x Voltage^2 x Frequency x Utilisation + +... which is more than the sustainable power (or there is something +wrong on the system setup). The ‘Capacitance’ and ‘Utilisation’ are a +fixed value, ‘Voltage’ and the ‘Frequency’ are fixed artificially +because we don’t want to change the OPP. We can group the +‘Capacitance’ and the ‘Utilisation’ into a single term which is the +‘Dynamic Power Coefficient (Cdyn)’ Simplifying the above, we have: + + Pdyn = Cdyn x Voltage^2 x Frequency + +The IPA will ask us somehow to reduce our power in order to target the +sustainable power defined in the device tree. So with the idle +injection mechanism, we want an average power (Ptarget) resulting on +an amount of time running at full power on a specific OPP and idle +another amount of time. That could be put in a equation: + + P(opp)target = ((trunning x (P(opp)running) + (tidle P(opp)idle)) / + (trunning + tidle) + ... + + tidle = trunning x ((P(opp)running / P(opp)target) - 1) + +At this point if we know the running period for the CPU, that gives us +the idle injection, we need. Alternatively if we have the idle +injection duration, we can compute the running duration with: + + trunning = tidle / ((P(opp)running / P(opp)target) - 1) + +Practically, if the running power is lesses than the targeted power, +we end up with a negative time value, so obviously the equation usage +is bound to a power reduction, hence a higher OPP is needed to have +the running power greater than the targeted power. + +However, in this demonstration we ignore three aspects: + + * The static leakage is not defined here, we can introduce it in the + equation but assuming it will be zero most of the time as it is + difficult to get the values from the SoC vendors + + * The idle state wake up latency (or entry + exit latency) is not + taken into account, it must be added in the equation in order to + rigorously compute the idle injection + + * The injected idle duration must be greater than the idle state + target residency, otherwise we end up consuming more energy and + potentially invert the mitigation effect + +So the final equation is: + + trunning = (tidle - twakeup ) x + (((P(opp)dyn + P(opp)static ) - P(opp)target) / P(opp)target ) From patchwork Tue Dec 3 09:37:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 180716 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1266278ile; Tue, 3 Dec 2019 01:37:19 -0800 (PST) X-Google-Smtp-Source: APXvYqwoud+AEF1LPDzA/ylsmD9gMO5g4r693teTyyir8n+iOv/RN0mO/flIvrsaqYWD1LGpNznd X-Received: by 2002:a05:6830:10a:: with SMTP id i10mr2334734otp.365.1575365839040; Tue, 03 Dec 2019 01:37:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575365839; cv=none; d=google.com; s=arc-20160816; b=upW9uyFqfQv/0xJ0H0qR4SmmVgD2lHJ2bGLdKO0QxUJSZtQKDVbN51njGxpT50cGZe uCOllXoD1bm/g3vIDj6ITwWBHgyF62rb64bByUDeIMu0V3WNPr0i2n74A9ojLAOLvKZ/ gF8q/baQDy1h3+yeiomHylDr1HXXS10itmLleRgWGHIFyT3IBxGHX46833OjISdv5evt gaqkxsCXfjNeLTkbjBpsfyP5M9zFRdTztRV4N58pCis3QUZE7pmWI/25p3Jk+T+jysdP iVoughSkawjmAb48E3vFGqLEGf0/4tVFc0um9zWRjpgdF+xL+BHTaydQbNxln/MfxsRB Mv4g== 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=IggfPB+tjS7935yy1bgS/bcntfnQ1JptbLU3i0UsIps=; b=Cpc2qQ1tPT+GFGKAlEMaxZYfYtZDaECNGQ/lJ2sOj++HTrRUOYg8RBc8Io7fQsGriJ Qxm8WtSG8hHna+ah6ha0uL4ufNZliALJZckAwU0EJnlILPgnDxInBjDH83yl9Obb8xH4 ZrkB1Pgzk+6kGqhSU+ifOvWa+EMgkPSL70M51x6ClgSMtK4K2pe8MtcR948H0uDz2PRm bRAHv0f3Fpfk4QpkEYm2JvH6uIB9aJMCWplYXY+gNcdHnJTmxBhxPFWje6wOkTIpkgA/ wm3no+gHm9WIKJeulP0vXjC6nqx1p3uTsxw3fbovPtg5LOVkCw9jk8UKDlezDzClX/Un Xh1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ycM6jNT5; 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 p25si977149oto.191.2019.12.03.01.37.18; Tue, 03 Dec 2019 01:37:19 -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=ycM6jNT5; 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 S1726395AbfLCJhS (ORCPT + 10 others); Tue, 3 Dec 2019 04:37:18 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35719 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726365AbfLCJhR (ORCPT ); Tue, 3 Dec 2019 04:37:17 -0500 Received: by mail-wm1-f68.google.com with SMTP id u8so2677101wmu.0 for ; Tue, 03 Dec 2019 01:37:15 -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=IggfPB+tjS7935yy1bgS/bcntfnQ1JptbLU3i0UsIps=; b=ycM6jNT5oat58eevSo1aLTeLS/H7yKuoFkvX3QQYu8yed18QLxFFAZZWszYH/wG4bI S+HLymrWtT1UcBKQSjdrCfkiN0MJaKGTCTJ5YWRiUBJ/QAe70A4hErXdinr7QjNEQ9hK jsM5cSjY5T9P/6rPoJD+fLYax3vLOkiEIFj+SRTZA6pOwIHT57ptKictaMEeh2q3nyJh 9uxerGTXmloR44A/snT+0AUAgS/T8zUPKq74t/ejzEMv4aZLIUuID3YMb0OTd14/MEDK gvVFvn96b5LYUcvK3a1AKEuNEZSLEi3w0UT+m6/H5j2jKKcodck6KqXmJNGORDYn85ci SNwQ== 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=IggfPB+tjS7935yy1bgS/bcntfnQ1JptbLU3i0UsIps=; b=FxmGva03SJ8VFssjFiXDuQQXhgo1Encnfn44UQjgGwEvPDAwOUC3zCxjMxFJ1qLJ+w h2+zyz2aYYytKFv+EKPL55Bew4RX6G2iTrl+WivuFBbZBwj3by7hufTOrZmOcsEshQpd v6f3QItHJwUm7edvZ+BRxWCSgmnA2t157Jw28qUrhqNGDB4WILJ5PiT2pr5Jw4D1hcUT 87BEtYa01g8xo5Y733Eb0Ug4YOqjS8+O52oQMAMzf/fx1KiRVBom5KOh9ATfg8rSv4/Q 47zdBzBJoMjiuc8SSn4r2fkdsqdZOJgLDgwBxA5D+/Y9uEaSyFkkjRzyIoZqW5gFqLIL p4Vg== X-Gm-Message-State: APjAAAXTL+3I1iYMvcOpVbpSZNGyWxH8YgVy5TBagAZ1H8kwfwFZavc6 d5fhVUNQzXU8AbpOofOF8zaQZg== X-Received: by 2002:a7b:c5d0:: with SMTP id n16mr34490278wmk.78.1575365833778; Tue, 03 Dec 2019 01:37:13 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:8196:cbcc:fb2c:4975]) by smtp.gmail.com with ESMTPSA id w13sm2935751wru.38.2019.12.03.01.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 01:37:13 -0800 (PST) From: Daniel Lezcano To: viresh.kumar@linaro.org, rui.zhang@intel.com Cc: rjw@rjwysocki.net, edubezval@gmail.com, linux-pm@vger.kernel.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 3/4] thermal/drivers/cpu_cooling: Introduce the cpu idle cooling driver Date: Tue, 3 Dec 2019 10:37:03 +0100 Message-Id: <20191203093704.7037-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203093704.7037-1-daniel.lezcano@linaro.org> References: <20191203093704.7037-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 cycle is fixed while the running cycle 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 --- 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 diff --git a/MAINTAINERS b/MAINTAINERS index c570f0204b48..d2e92a0360f2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16187,12 +16187,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 THINKPAD ACPI EXTRAS DRIVER diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 4e3ee036938b..4ee9953ba5ce 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -169,6 +169,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 d3b01cc96981..9c8aa2d4bd28 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..7d91a1b298d4 --- /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: an 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 the following: + * + * 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. + * + * Returns an unsigned int for an 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 gives 100 as the injection ratio is percentile + * based for consistency accros different platforms. + * + * The function can not fail, it always returns 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 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 copy the state value from the private thermal + * cooling device structure, the mapping is 1 <-> 1. + * + * The function can not fail, it always returns 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. + * + * The function can not fail, it always returns 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. + * + * Returns 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 (IS_ERR(ii_dev)) { + ret = PTR_ERR(ii_dev); + goto out_id; + } + + idle_inject_set_duration(ii_dev, 0, 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. + * + * Returns 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__ */ From patchwork Tue Dec 3 09:37: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: 180717 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1266286ile; Tue, 3 Dec 2019 01:37:19 -0800 (PST) X-Google-Smtp-Source: APXvYqytvddf+9Gu/aN+sDpT4LeSlL8/zneCrx7NeWEW7EgZSBfdcassd8PkmkHgNlJdRrXudCvB X-Received: by 2002:a9d:6f85:: with SMTP id h5mr2487566otq.19.1575365839359; Tue, 03 Dec 2019 01:37:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575365839; cv=none; d=google.com; s=arc-20160816; b=vEzuzMY0Qi6PzxMcLt/Fj4hdXkMXLf4GUYllHLtKSWpboXX9FJ5C/EeFyr9WyUVidx z3Ivtd0mKQyyAyn/H8Lo3Wm6m8sGUJMqJv6JfmsiSCQhTvZThpEdVxL6vcFAJwVck6+/ CfBBTydmO2WVJhpo3d5ctZkInDuDuXGRf3DB45bOHje7SGr09Vla5JfPYOXbvi6sCcPY d/8Esd2RD8Ql8aqJKOTMta6zxcxBieX5UJTYnweXVgpN4eh0tNXsJcAB2AvnPKeMhXlt cdS5XIoAzGt3sK2QwuZ44Vgjm0JBWRtc+hPEZXouBnmJSMeqNM7c8W5iiGFoSkmP4AWQ FXgA== 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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=ItBDFZRsnfQfciAAabN3wl4AcH/vwYVhTMMvAB4qoZCvVde0SZA6XVaKoLhRz6t7lX DcwrVNoMj53AL4QgrIdSbXXPStpR6ZJSuAZI+y2d50/bcWKaI/W5tkhXTf+KtnfURSfx esvNvy/W0kfMR3O8nteuVacP0kxEpBwbigGpWXq3HI5iZa8DeQfwlUH/c7D0e+txi5Sy mPe96go3FA+NaZRy3a5RPZejIMJy5ccY/X9R/PfpLCC87fCO+eLfQO1ylfldf80YVlJy 8X+znroFn60sCryQiJTkrYtsx1UQOuArmmqbj3hRd7wfOzTlk7bz8X3X1lUCxCUA77W5 FVtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E65o8Gbh; 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 p25si977149oto.191.2019.12.03.01.37.19; Tue, 03 Dec 2019 01:37:19 -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=E65o8Gbh; 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 S1726365AbfLCJhS (ORCPT + 10 others); Tue, 3 Dec 2019 04:37:18 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:37918 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726386AbfLCJhS (ORCPT ); Tue, 3 Dec 2019 04:37:18 -0500 Received: by mail-wr1-f68.google.com with SMTP id y17so2768406wrh.5 for ; Tue, 03 Dec 2019 01:37:15 -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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=E65o8GbhaN6dhsWwqzOmls+WOicYbtpQe1WLFww2Jaa7JRztNoOiGZ1KrFWIh7zroa PD3m16AUfEZovja7lfC1k64JxzC1hmTdp7WHe7tGzNB9iXuyUR3Sv1Z0dH1S7tCMx30N cQDUdtZNMQuQKrytVyqyB9a8sWZ4wGV55Rsvb5vj4evXM/2omPE92xA2TQ6i6L/U8YT0 z8QnLUuCWiyXCVpdhJS3s4LFc/YsSdeDrdNf4khoh2erPEN/qQJqXyvCEPDWgfAJePgW pFHmVbBmDN9BjHHOHVcntF6yAo27fTWTeDVByAWFYHnYaLg9mdx9jz8IfIvJ3YuOdDRu qP8Q== 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=n1V4m5uHfTZUZxbvB/zT+U3+jIt/r2ueCcg5F/IHP4U=; b=hAoiTxYUGh2ETEuJpv85GM7SoyWPD1lmQaP5IVFH50timNQ6szxrWmzvzr5wsZz73+ QCK2L/dlvNZB6/7S0mbuj99iUn4tSWTzZ31Uxb3EhTxqHHb1tXgah1JVOTUbVFIeeGDz W4JAOma3OKfwfBLiw0SSeDaDu4UqpZZqryn+YB2OWVXsaZ9JTbE93K1C68JHKgTrNc+G tObsVLo3XwJWgBHJ0mhUKRrgd2RQIMh547UgZAbW856LSwLK1tgTvlKxjSi7VCnaXx+B dZEoteqwuSCbqThWUi9nbzWqiL0FhfT9WI6uwu6eyk3XM5+0pJLwtxzHPw2vhnLtSzd9 m7Qg== X-Gm-Message-State: APjAAAXjkGhB5tK4bLvw3vZYJLdjTkUulOovPffREvhj3xReY9mInfo0 kCJ3I+HrGKASdMtUTfrEX9RXtA== X-Received: by 2002:adf:f411:: with SMTP id g17mr3958312wro.89.1575365834904; Tue, 03 Dec 2019 01:37:14 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:8196:cbcc:fb2c:4975]) by smtp.gmail.com with ESMTPSA id w13sm2935751wru.38.2019.12.03.01.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 01:37:14 -0800 (PST) From: Daniel Lezcano To: viresh.kumar@linaro.org, rui.zhang@intel.com Cc: rjw@rjwysocki.net, edubezval@gmail.com, linux-pm@vger.kernel.org, amit.kucheria@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 4/4] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Tue, 3 Dec 2019 10:37:04 +0100 Message-Id: <20191203093704.7037-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191203093704.7037-1-daniel.lezcano@linaro.org> References: <20191203093704.7037-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org As we introduced the idle injection cooling device called cpuidle_cooling, let's be consistent and rename the cpu_cooling to cpufreq_cooling as this one mitigates with OPPs changes. Signed-off-by: Daniel Lezcano --- V3: - Fix missing name conversion (Viresh Kumar) --- Documentation/driver-api/thermal/exynos_thermal.rst | 2 +- MAINTAINERS | 2 +- drivers/thermal/Makefile | 2 +- drivers/thermal/clock_cooling.c | 2 +- drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} | 6 +++--- include/linux/clock_cooling.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) rename drivers/thermal/{cpu_cooling.c => cpufreq_cooling.c} (99%) -- 2.17.1 Acked-by: Viresh Kumar Reviewed-by: Amit Kucheria diff --git a/Documentation/driver-api/thermal/exynos_thermal.rst b/Documentation/driver-api/thermal/exynos_thermal.rst index 5bd556566c70..d4e4a5b75805 100644 --- a/Documentation/driver-api/thermal/exynos_thermal.rst +++ b/Documentation/driver-api/thermal/exynos_thermal.rst @@ -67,7 +67,7 @@ TMU driver description: The exynos thermal driver is structured as:: Kernel Core thermal framework - (thermal_core.c, step_wise.c, cpu_cooling.c) + (thermal_core.c, step_wise.c, cpufreq_cooling.c) ^ | | diff --git a/MAINTAINERS b/MAINTAINERS index d2e92a0360f2..26e4be914765 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16194,7 +16194,7 @@ 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/cpufreq_cooling.c F: drivers/thermal/cpuidle_cooling.c F: include/linux/cpu_cooling.h diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 9c8aa2d4bd28..5c98472ffd8b 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -19,7 +19,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o 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_FREQ_THERMAL) += cpufreq_cooling.o thermal_sys-$(CONFIG_CPU_IDLE_THERMAL) += cpuidle_cooling.o # clock cooling diff --git a/drivers/thermal/clock_cooling.c b/drivers/thermal/clock_cooling.c index 3ad3256c48fd..7cb3ae4b44ee 100644 --- a/drivers/thermal/clock_cooling.c +++ b/drivers/thermal/clock_cooling.c @@ -7,7 +7,7 @@ * Copyright (C) 2013 Texas Instruments Inc. * Contact: Eduardo Valentin * - * Highly based on cpu_cooling.c. + * Highly based on cpufreq_cooling.c. * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * Copyright (C) 2012 Amit Daniel */ diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpufreq_cooling.c similarity index 99% rename from drivers/thermal/cpu_cooling.c rename to drivers/thermal/cpufreq_cooling.c index 6b9865c786ba..3a3f9cf94b6d 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * linux/drivers/thermal/cpu_cooling.c + * linux/drivers/thermal/cpufreq_cooling.c * * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * @@ -694,7 +694,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) u32 capacitance = 0; if (!np) { - pr_err("cpu_cooling: OF node not available for cpu%d\n", + pr_err("cpufreq_cooling: OF node not available for cpu%d\n", policy->cpu); return NULL; } @@ -705,7 +705,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) cdev = __cpufreq_cooling_register(np, policy, capacitance); if (IS_ERR(cdev)) { - pr_err("cpu_cooling: cpu%d failed to register as cooling device: %ld\n", + pr_err("cpufreq_cooling: cpu%d failed to register as cooling device: %ld\n", policy->cpu, PTR_ERR(cdev)); cdev = NULL; } diff --git a/include/linux/clock_cooling.h b/include/linux/clock_cooling.h index b5cebf766e02..4b0a69863656 100644 --- a/include/linux/clock_cooling.h +++ b/include/linux/clock_cooling.h @@ -7,7 +7,7 @@ * Copyright (C) 2013 Texas Instruments Inc. * Contact: Eduardo Valentin * - * Highly based on cpu_cooling.c. + * Highly based on cpufreq_cooling.c. * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com) * Copyright (C) 2012 Amit Daniel */