From patchwork Thu Dec 19 22:53:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 182195 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp1112346iln; Thu, 19 Dec 2019 14:53:28 -0800 (PST) X-Google-Smtp-Source: APXvYqwDvPmsKBX2jf0XXh3yucout+b7/RJETx16fKaF7iYdBMnAqbCMZ7Tx6ouAS3JByQBNEoVr X-Received: by 2002:a9d:48a:: with SMTP id 10mr10582547otm.95.1576796008680; Thu, 19 Dec 2019 14:53:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576796008; cv=none; d=google.com; s=arc-20160816; b=VegenWEoodWHG8LNciN50xHluEnkLE2pXyqUa0zeBgtDPs/vmC3BLyp8QlBs/9DrXS VfxSXYNO13LRsueNqjy5LhDsjxpUGDqcmdCTd14WcLZn8WmuFJrf4QqrRYpmh6JC9KYo M7MsoykEGAZswHBSkw4oUumx/qHxN/n9XNCZE76udaaPaJdpsNnLWyF8Tq2XSnqKOVAO PoSTvbXSxf51aoPubUuHb+kijbCglzjqyT4Q/2zrv+Cm+6AKYk8F2JczQDthYVE3YoOj 9VE7gcXREpGSv5q4Vdq2BRayzyo6qFsI5usXSpx0Bls71m1jp2CtuKQccXbx0FtESILz XWPg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=IDTZTqQqMM7njfiIlWdMkGGJ0GW+H7WGtwJONF+jRcI=; b=ADbQ5nUjYcFGUNBfec4RvvIh8Y+STRSDU/rEPSHXI1J3+ZNWlJXjDqMKAHZxoh4sGf WJ8/3fiABZx6rkqPK7U2eMLCBLUf+pdyVm+jXAbOJmw4NBC9p533061ltrU23IjsH+fr Gwdwuz8tfucWiK8N/uuhZXgdGpl+65O9vdTklTBYjj/DPLXhrlKGk7FgckBnRQ86zdf/ D/ksxdWE5uflcqgVi4hLSP/MqzdhqKFCmCZLF32EDGr/8zHJ4nYFJ2Tw6GTvvfoYSh7x vqQu3HhDn1waoMUf46MtJGYnf+yfAqMmppzEVfd91kH2rW7vMLNgQOe/jaERpmEhaiaq wSTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gXww8OgR; 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 f4si4017403oto.169.2019.12.19.14.53.28; Thu, 19 Dec 2019 14:53:28 -0800 (PST) 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=gXww8OgR; 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 S1727071AbfLSWx1 (ORCPT + 27 others); Thu, 19 Dec 2019 17:53:27 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:46592 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726930AbfLSWx0 (ORCPT ); Thu, 19 Dec 2019 17:53:26 -0500 Received: by mail-wr1-f67.google.com with SMTP id z7so7555371wrl.13 for ; Thu, 19 Dec 2019 14:53:24 -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:mime-version :content-transfer-encoding; bh=IDTZTqQqMM7njfiIlWdMkGGJ0GW+H7WGtwJONF+jRcI=; b=gXww8OgR3jaOVzm1bdVnzGpziMjOfqsoJ3buYVbCkQpdcU7kHpBo11pXA7QEGMur4D lOemboPgvPyq0Tdhv6alZ1QAp6qLs1mMEQfDFeK/vbNRrTT21uf0HpX0sipcTltqXUmD vBl4u5BK0+BUcNzcCywRaJqW0GzytZr6UqCQ0JNubVzHAh7RsDozzIUettUXyX3rdlkY +WP1u/WgPLaRm5nDf9jm2NidYg24lYMAdi+pSShZ0w2WzJmxFp87c1gYM5QTLQCCTPRD k0cQRKDbS86L2XNsn/AeYsU4Ofzkrvn5XiKfSP5Q8NO5g0P8sqTT7wj3ehW8Gc9cwDT/ eHyw== 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:mime-version :content-transfer-encoding; bh=IDTZTqQqMM7njfiIlWdMkGGJ0GW+H7WGtwJONF+jRcI=; b=q/nPVWtiHWw3YdgSYgEFD/jisPSm1VHkQC3cK+JNsIIi/z2j5qiTrcRfgrD1t6XZrS ObrhmnVYnZQgv/Hlyaw+S5b0g9u+xHxoe6h/vWsK40O0b9Juy2jK/D1xV901WiomZ9jv wz0/CZWIgHpRio8EXOXT8yejAAMQQ5NCC9GtnqIc/+dAaY068w9b8nGfuInIm+K3tblT 45NMRvwyGPHPcbm8m9BCvjaAQD1mOKb/rFph/K8qUeLsvaKE1AB1cBha6qAWyNvfFzYx 3pGRK6t+SI0T8JnjsLx4cO4efCCnd6bM3FfZeU6htL0BPG2XX45fLQJpZrBY2jiBT6Wf IvMA== X-Gm-Message-State: APjAAAUV1AQiCuiKYutGFXihYl0DCuUwPLhrfMB/mUOdwpeEjvScng3j GGo3w24frVmQgY2UaVScoQHXSvCixNk= X-Received: by 2002:a5d:480b:: with SMTP id l11mr11996674wrq.129.1576796003635; Thu, 19 Dec 2019 14:53:23 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:58d:4e9b:2833:86c3]) by smtp.gmail.com with ESMTPSA id p15sm7581930wma.40.2019.12.19.14.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 14:53:23 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, 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 V6 1/3] thermal/drivers/cpu_cooling: Add idle cooling device documentation Date: Thu, 19 Dec 2019 23:53:15 +0100 Message-Id: <20191219225317.17158-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- V5: - Fix trailing withspace V4: - Fixed typos, replaced 'period' per 'duty cycles', clarified some wording (Amit Kucheria) --- .../driver-api/thermal/cpu-idle-cooling.rst | 189 ++++++++++++++++++ 1 file changed, 189 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..e4f0859486c7 --- /dev/null +++ b/Documentation/driver-api/thermal/cpu-idle-cooling.rst @@ -0,0 +1,189 @@ + +Situation: +---------- + +Under certain circumstances a SoC can reach a critical temperature +limit and 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 +critical temperature is reached, a decision must be taken to reduce +the temperature, that, in turn impacts performance. + +Another situation is when the silicon temperature continues to +increase even after the dynamic leakage is reduced to its minimum by +clock gating the component. This runaway phenomenon can continue due +to the static leakage. The only solution is to power down the +component, thus dropping the dynamic and static leakage that 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 under-utilize the CPU, thus +losing performance. In other words, one OPP under-utilizes the CPU +with a power less than the requested power budget and the next OPP +exceeds 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 on 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 scenarios. + +At a specific OPP, we can assume that injecting idle cycle on all CPUs +belong to the same cluster, with a duration greater than the cluster +idle state target residency, we lead to dropping 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 cycles synchronously, the cluster can reach its power down +state with a minimum power consumption and reduce the static leakage +to almost zero. However, these idle cycles injection will add extra +latencies as the CPUs will have to wakeup from a deep sleep state. + +We use a fixed duration of idle injection that gives an acceptable +performance penalty and a fixed latency. Mitigation can be increased +or decreased by modulating the duty cycle of the idle injection. + + ^ + | + | + |------- ------- + |_______|_______________________|_______|___________ + + <------> + idle <----------------------> + running + + <-----------------------------> + duty cycle 25% + + +The implementation of the cooling device bases the number of states on +the duty cycle percentage. When no mitigation is happening the cooling +device state is zero, meaning the duty cycle is 0%. + +When the mitigation begins, depending on the governor's policy, a +starting state is selected. With a fixed idle duration and the duty +cycle (aka the cooling device state), the running duration can be +computed. + +The governor will change the cooling device state thus the duty cycle +and this variation will modulate the cooling effect. + + ^ + | + | + |------- ------- + |_______|_______________|_______|___________ + + <------> + idle <--------------> + running + + <-----------------------------> + duty cycle 33% + + + ^ + | + | + |------- ------- + |_______|_______|_______|___________ + + <------> + idle <------> + running + + <-------------> + duty cycle 50% + +The idle injection duration value must comply with the constraints: + +- It is less than 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. + +Power considerations +-------------------- + +When we reach the thermal trip point, we have to sustain a specified +power for a 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 in 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 power allocator governor 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 in 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 x 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 less 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 Thu Dec 19 22:53:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 182197 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp1112457iln; Thu, 19 Dec 2019 14:53:36 -0800 (PST) X-Google-Smtp-Source: APXvYqwlHx4yXGZmMOCAnRmO5R7dbX3Ucf4MtxkeFDZg3tY//dL1GogNXB17LesTAz5OzMxDqIOC X-Received: by 2002:a9d:4706:: with SMTP id a6mr10504413otf.331.1576796016294; Thu, 19 Dec 2019 14:53:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576796016; cv=none; d=google.com; s=arc-20160816; b=TzIpA2kooISkSWweY+xUFUJuiYRMIeMaTN5kDseNRvOpxMHKcziXfEoBCVFSGwlHUQ 9xuMHg08KxCk73BFIcL1hoMjvmQQh+4uCbomjnu4ihzG+bvTJ3hn+0uq6KTqlZcdR2yj FI1zPEn2+H1ommFXVhYiLmu17VzhuK2Cc1KcEIHzIj0xZE9gGLqpoLgIDpuWh6Jq4dAv 4mNBaih0lirKBVWRpjfJ4vGRuTCjl8k7CGHZkYkR7JTjkFKVEnvyDhDrnSBB86AP2Tdg y4cTK0l52XcCvasp9Vc6peLrAfhO4eGp/3wrPB7bEZZ0aIQZ4c4jVMZjJgjsMaGGkxeN RhjA== 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=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=Efqu4joWNOCEHHZzk1ND1Y12dYwMvN1pZnzwHQAnmN8aSojPbn6xVmp1WH6hUqJY5T lj/D9O851orxS2yTvN8EC7YRufhu6JtfQuKgyqehKMpW3mx+Dp+s+Jl0tKuZKa7aV71l YNtk5tBrXMko6hYfcaQwfumqXCX1TaxQj8942Q6aQFtUSv5frPxwQszGBNOX4/HNNHpv olkRQsrGlL9XJ6D1t7XsddtzxyvokWxVGpCC0HmOs/LFS0YUys/mBkaNX1JRgXC6m+nv JoS70m9/cqKWABSaPqNru9isfY2sxhYoxtYH6mPzAQo76TSO70gJhj9O598whxfJpFMP oyBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hms1C9No; 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 n14si4249041otk.179.2019.12.19.14.53.36; Thu, 19 Dec 2019 14:53:36 -0800 (PST) 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=Hms1C9No; 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 S1727165AbfLSWxc (ORCPT + 27 others); Thu, 19 Dec 2019 17:53:32 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:36308 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726967AbfLSWx2 (ORCPT ); Thu, 19 Dec 2019 17:53:28 -0500 Received: by mail-wm1-f67.google.com with SMTP id p17so7346116wma.1 for ; Thu, 19 Dec 2019 14:53:26 -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=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=Hms1C9NofkMz6T1NTyhmVkYBl4ZPR7sI0C/LuYX9azSAlOO86De1fu3PgyXmOMRvte itWwqN+xHdp5diEsP7/PESs26jSYQOclJLteh1XsXEP02pJfChBbLTCtB+PVjphI+7Hz mgEqJ5xkwnF9YNciYBf/kcbt+ID0414YTZ4EumCnlW9DjglCbhx0IzKevZi3lV2oHLwW 25zbP/9sARVfASSZh50LdwUocnkQwtpVuVjO+WdneaBkIGwVueeLx+CUvneZ3mPJFPys jlJKsHkEJsegERjNFfX2gS3m4w1HbdvOykn1orsUOLbq5FH3il7mi7tcBDiJDCFYpYk5 zb6w== 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=sBcrCTViVT+buUkazP6ndZ+R56LFcmai8/NG1/x431U=; b=VVO7tc39aYfYV0hP1ExHG3fDqeVX9vwO03EmivoeVDJ8VCfQ6I/HOidrylJgh9MiNa A1a0PKrc3BgEGy7+U4YRg8r+S7CDVWhLG/Iz/xM1B+zzaT2GX2Dkb06GndkF1AvdNLlu ixg6dVO8zc+HKmGUTzYBoJZ7GbvpGgV8h2dnLeUQZHOo4NwifM+9CsE1q8yH9kZ5IH5D PGPVp0f1VhlfjqMXgZ+G6OrXX8InUvrP9OvspsW+fdjhcRuMaqCFi4x5NLMvvW2mID/e ICWj67ID7AYdt6y3ud+qV6kK7S5jL5uYy48RHa2OrHvh02HITkqjDsTwgGmFEUDEV6Sa 0pIw== X-Gm-Message-State: APjAAAWwil1Z6x63jmGRH7UKtiemiVRnyZZOaor7IYMQNM2/9LTil3PW 5thbiMaM0lxK94IMME2UcDM3CQ== X-Received: by 2002:a7b:c151:: with SMTP id z17mr12575389wmi.137.1576796006039; Thu, 19 Dec 2019 14:53:26 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:58d:4e9b:2833:86c3]) by smtp.gmail.com with ESMTPSA id p15sm7581930wma.40.2019.12.19.14.53.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 14:53:25 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, 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 V6 3/3] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Thu, 19 Dec 2019 23:53:17 +0100 Message-Id: <20191219225317.17158-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191219225317.17158-1-daniel.lezcano@linaro.org> References: <20191219225317.17158-1-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 Acked-by: Viresh Kumar Reviewed-by: Amit Kucheria --- V4: - Added Acked-by and Reviewed-by 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 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 d92e9eb14131..0d658a628296 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16337,7 +16337,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 6929e6fad1ac..d502a597a717 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 52569b27b426..1dcba6bcaf7b 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) * @@ -620,7 +620,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) struct thermal_cooling_device *cdev = NULL; 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; } @@ -630,7 +630,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) cdev = __cpufreq_cooling_register(np, policy, em); 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 */