Implement change_mode() to disable sensor IRQs when a sensor is disabled.
Note that this commit does not touch:
- The tsens device's CPU IRQ, which is global across all sensors on a tsens
device.
- Power/clock of the sensor. Future work is needed in the tsens_ops
interface to support single-sensor disable + handle quirks (the only
implementation of tsens_ops->enable and disable only supports individual
enable/disable on some sensors, and others must be enabled/disabled as a
block).
'echo disabled > .../thermal_zoneX/mode' will disable the thermal core's
polling mechanism to check for threshold trips. However, tsens supports
an interrupt mechanism to receive notification of trips, implemented in
commit 634e11d5b450 ("drivers: thermal: tsens: Add interrupt support").
This is used sometimes to run performance test cases.
Currently the thermal zone mode that's set by userspace does not control
threshold trip events from IRQs. Let's fix this to restore the abilty to
disable thermal throttling at runtime.
====================
Tested on MSM8939 running 5.17. This platform has 8 cores; the first four
thermal zones control cpu0-3 and the last zone is for the other four CPUs
together.
for f in /sys/class/thermal/thermal_zone*; do
echo "disabled" > $f/mode
echo $f | paste - $f/type $f/mode
done
/sys/class/thermal/thermal_zone0 cpu0-thermal disabled
/sys/class/thermal/thermal_zone1 cpu1-thermal disabled
/sys/class/thermal/thermal_zone2 cpu2-thermal disabled
/sys/class/thermal/thermal_zone3 cpu3-thermal disabled
/sys/class/thermal/thermal_zone4 cpu4567-thermal disabled
With mitigation thresholds at 75 degC and load running, we can now cruise
past temp=75000 without CPU throttling kicking in.
watch -n 1 "grep '' /sys/class/thermal/*/temp
/sys/class/thermal/*/cur_state
/sys/bus/cpu/devices/cpu*/cpufreq/cpuinfo_cur_freq"
/sys/class/thermal/thermal_zone0/temp:82000
/sys/class/thermal/thermal_zone1/temp:84000
/sys/class/thermal/thermal_zone2/temp:87000
/sys/class/thermal/thermal_zone3/temp:84000
/sys/class/thermal/thermal_zone4/temp:84000
/sys/class/thermal/cooling_device0/cur_state:0
/sys/class/thermal/cooling_device1/cur_state:0
/sys/bus/cpu/devices/cpu0/cpufreq/cpuinfo_cur_freq:1113600
/sys/bus/cpu/devices/cpu1/cpufreq/cpuinfo_cur_freq:1113600
/sys/bus/cpu/devices/cpu2/cpufreq/cpuinfo_cur_freq:1113600
/sys/bus/cpu/devices/cpu3/cpufreq/cpuinfo_cur_freq:1113600
/sys/bus/cpu/devices/cpu4/cpufreq/cpuinfo_cur_freq:800000
/sys/bus/cpu/devices/cpu5/cpufreq/cpuinfo_cur_freq:800000
/sys/bus/cpu/devices/cpu6/cpufreq/cpuinfo_cur_freq:800000
/sys/bus/cpu/devices/cpu7/cpufreq/cpuinfo_cur_freq:800000
Reported-by: Zac Crosby <zac@xxxxxxxxxxxx>
Reviewed-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Signed-off-by: Benjamin Li <benl@xxxxxxxxxxxx>
---
drivers/thermal/qcom/tsens.c | 43 ++++++++++++++++++++++++++++++++++--
drivers/thermal/qcom/tsens.h | 4 ++++
2 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 99a8d9f3e03c..d5263436f959 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -564,8 +564,12 @@ static int tsens_set_trips(void *_sensor, int low, int high)
/* Write the new thresholds and clear the status */
regmap_field_write(priv->rf[LOW_THRESH_0 + hw_id], low_val);
regmap_field_write(priv->rf[UP_THRESH_0 + hw_id], high_val);
- tsens_set_interrupt(priv, hw_id, LOWER, true);
- tsens_set_interrupt(priv, hw_id, UPPER, true);
+ s->trips_configured = true;
+
+ if (s->enable_irqs) {
+ tsens_set_interrupt(priv, hw_id, LOWER, true);
+ tsens_set_interrupt(priv, hw_id, UPPER, true);
+ }
spin_unlock_irqrestore(&priv->ul_lock, flags);
@@ -575,6 +579,40 @@ static int tsens_set_trips(void *_sensor, int low, int high)
return 0;
}
+static int tsens_change_mode(void *_sensor, enum thermal_device_mode mode)
+{
+ struct tsens_sensor *s = _sensor;
+ struct tsens_priv *priv = s->priv;
+ u32 hw_id = s->hw_id;
+ bool enable = (mode == THERMAL_DEVICE_ENABLED);
+ unsigned long flags;
+
+ if (tsens_version(priv) < VER_0_1) {
+ /* Pre v0.1 IP had a single register for each type of interrupt
+ * and threshold, so we can't support individual enable/disable.
+ */
+ hw_id = 0;
+ enable = true;
+ }
+
+ spin_lock_irqsave(&priv->ul_lock, flags);
+
+ /* During sensor registration, thermal core calls change_mode(ENABLED)
+ * before it calls set_trips(low, high). To avoid enabling threshold
+ * interrupts before thresholds are configured, let's let set_trips do
+ * the first enable.
+ */
+ if (s->trips_configured) {
+ tsens_set_interrupt(priv, hw_id, LOWER, enable);
+ tsens_set_interrupt(priv, hw_id, UPPER, enable);
+ }
+ s->enable_irqs = enable;
+
+ spin_unlock_irqrestore(&priv->ul_lock, flags);
+
+ return 0;
+}
+
static int tsens_enable_irq(struct tsens_priv *priv)
{
int ret;
@@ -1002,6 +1040,7 @@ static const struct thermal_zone_of_device_ops tsens_of_ops = {
.get_temp = tsens_get_temp,
.get_trend = tsens_get_trend,
.set_trips = tsens_set_trips,
+ .change_mode = tsens_change_mode,
};
static int tsens_register_irq(struct tsens_priv *priv, char *irqname,
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 1471a2c00f15..1a835d7688e0 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -45,6 +45,8 @@ enum tsens_irq_type {
* @offset: offset of temperature adjustment curve
* @hw_id: HW ID can be used in case of platform-specific IDs
* @slope: slope of temperature adjustment curve
+ * @trips_configured: whether this sensor's upper/lower thresholds are set
+ * @enable_irqs: whether this sensor's threshold IRQs should be enabled
* @status: 8960-specific variable to track 8960 and 8660 status register offset
*/
struct tsens_sensor {
@@ -53,6 +55,8 @@ struct tsens_sensor {
int offset;
unsigned int hw_id;
int slope;
+ bool trips_configured;
+ bool enable_irqs;
u32 status;
};
--
2.17.1
