From: Leo Yan <leo.yan@linaro.org>
To: Jonathan Corbet <corbet@lwn.net>, Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Javi Merino <javi.merino@arm.com>,
Punit Agrawal <punit.agrawal@arm.com>,
Daniel Kurtz <djkurtz@chromium.org>,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-pm@vger.kernel.org,
Daniel Thompson <daniel.thompson@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v2 1/4] thermal: power_allocator: rework proportional parameter
Date: Wed, 6 Jan 2016 16:30:20 +0800 [thread overview]
Message-ID: <1452069023-32149-2-git-send-email-leo.yan@linaro.org> (raw)
In-Reply-To: <1452069023-32149-1-git-send-email-leo.yan@linaro.org>
k_po/k_pu are two proportional term constants and essentially they have
fixed ratio compared with sustainable power. In current implementation,
k_po and k_pu are absolute value after calculation and cannot represent
the ratio relationship with sustainable power; as a result, when change
sustainable power we cannot smoothly change proportional term constant.
So this patch introduces variants k_po_ratio and k_pu_ratio, which
represent the ratio value compared against sustainable power, so smaller
ratio will result in thermal slower ramp. The formulas finally are as
below:
k_pu = k_pu_ratio * sustainable_power /
(desired_temperature - switch_on_temp)
k_po = k_po_ratio * sustainable_power /
(desired_temperature - switch_on_temp)
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
drivers/thermal/power_allocator.c | 18 ++++++++++++------
include/linux/thermal.h | 4 ++--
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/thermal/power_allocator.c b/drivers/thermal/power_allocator.c
index 1246aa6..76d2b47 100644
--- a/drivers/thermal/power_allocator.c
+++ b/drivers/thermal/power_allocator.c
@@ -155,13 +155,11 @@ static void estimate_pid_constants(struct thermal_zone_device *tz,
if (!temperature_threshold)
return;
- if (!tz->tzp->k_po || force)
- tz->tzp->k_po = int_to_frac(sustainable_power) /
- temperature_threshold;
+ if (!tz->tzp->k_po_ratio || force)
+ tz->tzp->k_po_ratio = 1;
- if (!tz->tzp->k_pu || force)
- tz->tzp->k_pu = int_to_frac(2 * sustainable_power) /
- temperature_threshold;
+ if (!tz->tzp->k_pu_ratio || force)
+ tz->tzp->k_pu_ratio = 2;
if (!tz->tzp->k_i || force)
tz->tzp->k_i = int_to_frac(10) / 1000;
@@ -169,6 +167,11 @@ static void estimate_pid_constants(struct thermal_zone_device *tz,
* The default for k_d and integral_cutoff is 0, so we can
* leave them as they are.
*/
+
+ tz->tzp->k_po = int_to_frac(tz->tzp->k_po_ratio * sustainable_power) /
+ temperature_threshold;
+ tz->tzp->k_pu = int_to_frac(tz->tzp->k_pu_ratio * sustainable_power) /
+ temperature_threshold;
}
/**
@@ -202,6 +205,9 @@ static u32 pid_controller(struct thermal_zone_device *tz,
if (tz->tzp->sustainable_power) {
sustainable_power = tz->tzp->sustainable_power;
+ estimate_pid_constants(tz, sustainable_power,
+ params->trip_switch_on, control_temp,
+ false);
} else {
sustainable_power = estimate_sustainable_power(tz);
estimate_pid_constants(tz, sustainable_power,
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 613c29b..2638f0b 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -284,13 +284,13 @@ struct thermal_zone_params {
* Proportional parameter of the PID controller when
* overshooting (i.e., when temperature is below the target)
*/
- s32 k_po;
+ s32 k_po, k_po_ratio;
/*
* Proportional parameter of the PID controller when
* undershooting
*/
- s32 k_pu;
+ s32 k_pu, k_pu_ratio;
/* Integral parameter of the PID controller */
s32 k_i;
--
1.9.1
next prev parent reply other threads:[~2016-01-06 8:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-06 8:30 [PATCH v2 0/4] thermal: re-calculate k_po/k_pu when update sustainable power Leo Yan
2016-01-06 8:30 ` Leo Yan [this message]
2016-01-06 8:30 ` [PATCH v2 2/4] thermal: power_allocator: change k_pu_ratio/k_po_ratio as percentage Leo Yan
2016-01-06 8:30 ` [PATCH v2 3/4] thermal: add sys node for k_pu_ratio/k_po_ratio Leo Yan
2016-01-06 8:30 ` [PATCH v2 4/4] thermal: power_allocator: document k_pu_ratio/k_po_ratio Leo Yan
2016-01-06 8:48 ` [PATCH v2 0/4] thermal: re-calculate k_po/k_pu when update sustainable power Leo Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452069023-32149-2-git-send-email-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=corbet@lwn.net \
--cc=daniel.thompson@linaro.org \
--cc=djkurtz@chromium.org \
--cc=edubezval@gmail.com \
--cc=javi.merino@arm.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=punit.agrawal@arm.com \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).