From patchwork Wed Dec 11 22:43:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 181352 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp113882ile; Wed, 11 Dec 2019 14:44:06 -0800 (PST) X-Google-Smtp-Source: APXvYqzmVoWnnN+kStXyiWF9PggbXiqaELtS3XvuuBgKP0KK1aTCNiCAC2ZLs/E8jBJzEMKBFrNO X-Received: by 2002:a9d:730e:: with SMTP id e14mr4216404otk.62.1576104246884; Wed, 11 Dec 2019 14:44:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576104246; cv=none; d=google.com; s=arc-20160816; b=wyNsVVYph/rpHflZH7ktlFdMcCcw1uSeWv9LAe7vqPKI+9iFw7mGVATr4n0Pf+UkH4 sxEyTkuu7CHThlK8o4PBZJx44XCZ/rluBLcD5TebTIoZfd+RUQguxtnuUrZffZ3NjzFz NLPtNXxC//J+uVnP8VxzuDlEyxz4nB8897wJLTyO1pWKvBlt3jusIc+ift1Uw2t6AJfV j+sambJirX+pjUO1UpEvq673vM4YKgPkUIBFzoJdp1WKJrNXA/UABRGpUibME0hz32mC IOrR99IMs14eGbxoIAZMwUma+lr+IaT9Lgp4MFgcYcH4vS/XB8UJKexB2S/B4/S8mLGu g5zw== 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=eHar8caGVk2CHYCleN7lzgXckcrdAjaPRcEzE+leMkc=; b=F4KLeDAlUag5qcmncoxJy/cFGEhTaxFonEM8ta3ae9WwO7trYqmRIpfidPTgh3a4Xg 2GMeIPkU9G6rCAsX8d963qh6vvIQBGZzF2a/AFjGdtvnBFSHmzQ21UX3b48zJ4vHGjKf BFcojSaT+fxDuuhRa3Bj64nKtKAOSF0dvfYIhbuSziyNaOWhUSaZmx/rSgs0Bn/SoiiY qbDq6bmW42W4DNUq6Z7ZaShmXmDpDHarOvUcEvx5eC+O9sqxnKRJ3SOkDZoojJfUQTPc jUS4f1HZNTE8MLlhmYCTkX3OdSQ3Ax4wV++nGGSRX96nj00H/AsquJGMA8wPgkTCikQt kGyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=adUlVTiT; 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 n8si2010410otr.102.2019.12.11.14.44.06; Wed, 11 Dec 2019 14:44:06 -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=adUlVTiT; 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 S1726890AbfLKWoF (ORCPT + 27 others); Wed, 11 Dec 2019 17:44:05 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39534 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726592AbfLKWoE (ORCPT ); Wed, 11 Dec 2019 17:44:04 -0500 Received: by mail-wm1-f67.google.com with SMTP id d5so98391wmb.4 for ; Wed, 11 Dec 2019 14:44:02 -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=eHar8caGVk2CHYCleN7lzgXckcrdAjaPRcEzE+leMkc=; b=adUlVTiTz/iXrhnDM4CQmeVqAvo6g5aR4wZlXa2/qvQCfFdJBMaA2fP1Ktz4VgakJ9 BBO+16TMexseKta7EmbwHlfuSVpAUrBIWuLnAcmcbhRlSQYM6MMjAGNk+cmk3dzipVKv 5yCOUdWh0IB2vW2QZ/ipPZ6smv+S6mBHKcruTY9jukDzyAdeoICyWz1xtbaXYzMSfl/a NCjpGmD1r4vd2dBLCDnZiK1efTFD/2/OnfIvbI8G3NGDY4khNeRauKAu1pEEqxOH1049 UF4UA8Yy1Xme/7jfzyq9w2d9PQzmCjdGMfBXhYWITGHxf4AMCkQPj5C+0izWgcdzs+fw NJqQ== 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=eHar8caGVk2CHYCleN7lzgXckcrdAjaPRcEzE+leMkc=; b=kq4kqR52uFUMrJ4VKhJsfrThZX3ifuFGrFcEbY0xpyo6Jw6rSlnxRRBzXFT/u/sWDv hKzeJxwJranbU2YeqSEPcL0folpktLLCIrjUdI54EdORCXhuS+KiNBQKZJdKz0+LzNjS Xp8RkS+h8+hbzaeluvrCp83hYjbSoQZ/88oXNQfoGh/kdhMhw37qWF+i12q0JcGym0Va NyMJ4uPI5ZrlSSFrw4xkebyL9988inRGocUGdbttxAwGTflYtgnFp70Vhk9Rdqd9k2VV zml4Y9YAH1C2Z/96Va7mRJXGIdgjYFYUfa5KsL2mD2CgLb5M8m3PCLg3iYIuNUZCvKNX 2k8A== X-Gm-Message-State: APjAAAWLjCaMZeEFoIG2y9qWGtKqfJk06X0IrDSJuEXvsFlLRM/gzGr0 UA2VMuhlfQ1yy6LTu6lbOqvWSw== X-Received: by 2002:a7b:c7d3:: with SMTP id z19mr2420119wmk.94.1576104241537; Wed, 11 Dec 2019 14:44:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 14:44:00 -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 1/3] thermal/drivers/cpu_cooling: Add idle cooling device documentation Date: Wed, 11 Dec 2019 23:43:45 +0100 Message-Id: <20191211224347.1001-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 --- 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..13d7fe4e8de8 --- /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 Wed Dec 11 22:43:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 181354 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp113986ile; Wed, 11 Dec 2019 14:44:14 -0800 (PST) X-Google-Smtp-Source: APXvYqzH7HxFaw5zGjboeVa4DzVAmxhWseP7RI3Xdc3qlVRmYMfEyjw8hqD/0Cw8U+sN+FvyN511 X-Received: by 2002:a05:6830:1042:: with SMTP id b2mr4382779otp.306.1576104253898; Wed, 11 Dec 2019 14:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576104253; cv=none; d=google.com; s=arc-20160816; b=iImPZBNz/e6wnoboZAcPk8TW3hUBag1LK7bP8IaF8l3vdF+LbpjVt1K/Mt9KgDj4I5 zYIsTe6ULZQyhql/xiyd6xxpTCgQOKWk8Xv9jCyA/8t9rC13X2zD/F9qPXKUUt0xUM+g ayStKSk2AC0einWwXanpe1z+LoIPYmC1Eb8w96YvTdsHtT2RZJlCucx5EQMfa7hxtjEE TfXce7HlIT+ynKScnEnckVoqe/55cPvHyKXX+ChezDtgMeKADYdmInVqiBR4wKxGIMCm muy9JAf2l0Nk2udSVzy5zM8dAPoKRwDu9EeNlWbCbIUC9p7odkirWMH6C4ltdx3pA+tH WwfQ== 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=qwGyfoeooB3QSCdNCLshPGCVa9FZ3MyTg4ZKZX6B4ZJNLm6kkmMy9OM9kZE1j2Hd4R WsWdiVg6/yozRJaKfOwqM3qpqiP5zCMnxgfTSyaqfZd9rP+6JuTauwLYKv4RYMZUN4TY 2t9BbOD2yEJAe76y6FNhkyXzL0HE9QVObH/rYTyIiebVvZfC092wcDEdpI0LLqTH4bry a/n07sTt2KX8Y8WWX9OcZ2hZWNq6QxKBryU+7TdkoDJ6uF+pDC4JNq7y1HcZ4KuZMs22 P+vqkB7pTVbDhheHueBYj6+VDK4hqLBPxDcPpfSTf0rM2Nan8CwAaCfvLfr2GkO6seNc BP/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=B0n4QzR+; 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 m26si1841893otn.307.2019.12.11.14.44.13; Wed, 11 Dec 2019 14:44:13 -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=B0n4QzR+; 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 S1726926AbfLKWoJ (ORCPT + 27 others); Wed, 11 Dec 2019 17:44:09 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34949 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726708AbfLKWoH (ORCPT ); Wed, 11 Dec 2019 17:44:07 -0500 Received: by mail-wr1-f68.google.com with SMTP id g17so483651wro.2 for ; Wed, 11 Dec 2019 14:44:04 -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=B0n4QzR+8Dn/PNjTG+BqYKuWbD7QPHneTDLFVbLSZ2vbKcCA8M0sPy1gbo7O2ooZPv 81yQDTKkSE5CACbD71h/ZRug72pThiHj68475hZLEbnQS4D9qYhGm+/+4ZcAJ224d03+ sKe+LTGrbqsqKUtyjtfLVzngNo65pmDx4kPQS+Lb2Fe+zBeNyVBerBw/1PfAuy9ksv/9 WCGhsGUoDHWvVSR52Y3IHoie5IVwAp9RyMAUVJmdiJ9/DxUtqKA8eBduUWskwkbWM1oN i2g0qGyQ/wkpVeRmfQZAlmlccmsYXUH/jmHpllykYndBPlcoup6xnCznmwTe9zkhPGJC duuw== 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=bcT68drDY/duermakVj5FVmt5gEvOfB3L7pYxtfJpExWshFm/d/rUKo0vJAs1tPdvR FoeHkMBwjLeGkJHbw+ZESz8PT9c4KvHrcf14dpUIG+OScJ3ldPhsYAb00NUDJ1IG03Z7 mEHSdUp5O11aIecdpoipuThLQvEpb5h4vHukRM9ZUCHVycMrYNWGNHdVMVZiHiFGKlA5 DbJz1585NHXKs1JbaUuDfllKERIcZ0JrbZzw7exUVAW1jY/JgAbh2cIFYCpNI+BGfOmt HLYhK/elBH98fDn0LNS9KHP+94YqporruHXwYKDuBzRaP2qeyHCKVfgcMcmlxXN6y5g0 el9g== X-Gm-Message-State: APjAAAXotGoVA0osjEUQ7qEpctzWwWJToiImiw5or4WWvT3VaaUsjGzr W9k7ZlT9JvwfwD3z6sQyZaDw7g== X-Received: by 2002:adf:9144:: with SMTP id j62mr2300204wrj.168.1576104243820; Wed, 11 Dec 2019 14:44:03 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 14:44:03 -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 3/3] thermal/drivers/cpu_cooling: Rename to cpufreq_cooling Date: Wed, 11 Dec 2019 23:43:47 +0100 Message-Id: <20191211224347.1001-3-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-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 */