mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
c36de2e73a
Backport almost 50 commits from upstream Linux to improve thermal drivers for MediaTek SoCs and add new LVTS driver for MT7988. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
157 lines
4.9 KiB
Diff
157 lines
4.9 KiB
Diff
From d4dd09968cab3249e6148e1c3fccb51824edb411 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?N=C3=ADcolas=20F=2E=20R=2E=20A=2E=20Prado?=
|
|
<nfraprado@collabora.com>
|
|
Date: Thu, 6 Jul 2023 11:37:37 -0400
|
|
Subject: [PATCH 30/42] thermal/drivers/mediatek/lvts_thermal: Manage threshold
|
|
between sensors
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Each LVTS thermal controller can have up to four sensors, each capable
|
|
of triggering its own interrupt when its measured temperature crosses
|
|
the configured threshold. The threshold for each sensor is handled
|
|
separately by the thermal framework, since each one is registered with
|
|
its own thermal zone and trips. However, the temperature thresholds are
|
|
configured on the controller, and therefore are shared between all
|
|
sensors on that controller.
|
|
|
|
When the temperature measured by the sensors is different enough to
|
|
cause the thermal framework to configure different thresholds for each
|
|
one, interrupts start triggering on sensors outside the last threshold
|
|
configured.
|
|
|
|
To address the issue, track the thresholds required by each sensor and
|
|
only actually set the highest one in the hardware, and disable
|
|
interrupts for all sensors outside the current configured range.
|
|
|
|
Fixes: f5f633b18234 ("thermal/drivers/mediatek: Add the Low Voltage Thermal Sensor driver")
|
|
Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
|
|
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230706153823.201943-7-nfraprado@collabora.com
|
|
---
|
|
drivers/thermal/mediatek/lvts_thermal.c | 69 +++++++++++++++++++++++++
|
|
1 file changed, 69 insertions(+)
|
|
|
|
--- a/drivers/thermal/mediatek/lvts_thermal.c
|
|
+++ b/drivers/thermal/mediatek/lvts_thermal.c
|
|
@@ -67,6 +67,11 @@
|
|
#define LVTS_CALSCALE_CONF 0x300
|
|
#define LVTS_MONINT_CONF 0x8300318C
|
|
|
|
+#define LVTS_MONINT_OFFSET_SENSOR0 0xC
|
|
+#define LVTS_MONINT_OFFSET_SENSOR1 0x180
|
|
+#define LVTS_MONINT_OFFSET_SENSOR2 0x3000
|
|
+#define LVTS_MONINT_OFFSET_SENSOR3 0x3000000
|
|
+
|
|
#define LVTS_INT_SENSOR0 0x0009001F
|
|
#define LVTS_INT_SENSOR1 0x001203E0
|
|
#define LVTS_INT_SENSOR2 0x00247C00
|
|
@@ -112,6 +117,8 @@ struct lvts_sensor {
|
|
void __iomem *base;
|
|
int id;
|
|
int dt_id;
|
|
+ int low_thresh;
|
|
+ int high_thresh;
|
|
};
|
|
|
|
struct lvts_ctrl {
|
|
@@ -121,6 +128,8 @@ struct lvts_ctrl {
|
|
int num_lvts_sensor;
|
|
int mode;
|
|
void __iomem *base;
|
|
+ int low_thresh;
|
|
+ int high_thresh;
|
|
};
|
|
|
|
struct lvts_domain {
|
|
@@ -292,12 +301,66 @@ static int lvts_get_temp(struct thermal_
|
|
return 0;
|
|
}
|
|
|
|
+static void lvts_update_irq_mask(struct lvts_ctrl *lvts_ctrl)
|
|
+{
|
|
+ u32 masks[] = {
|
|
+ LVTS_MONINT_OFFSET_SENSOR0,
|
|
+ LVTS_MONINT_OFFSET_SENSOR1,
|
|
+ LVTS_MONINT_OFFSET_SENSOR2,
|
|
+ LVTS_MONINT_OFFSET_SENSOR3,
|
|
+ };
|
|
+ u32 value = 0;
|
|
+ int i;
|
|
+
|
|
+ value = readl(LVTS_MONINT(lvts_ctrl->base));
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(masks); i++) {
|
|
+ if (lvts_ctrl->sensors[i].high_thresh == lvts_ctrl->high_thresh
|
|
+ && lvts_ctrl->sensors[i].low_thresh == lvts_ctrl->low_thresh)
|
|
+ value |= masks[i];
|
|
+ else
|
|
+ value &= ~masks[i];
|
|
+ }
|
|
+
|
|
+ writel(value, LVTS_MONINT(lvts_ctrl->base));
|
|
+}
|
|
+
|
|
+static bool lvts_should_update_thresh(struct lvts_ctrl *lvts_ctrl, int high)
|
|
+{
|
|
+ int i;
|
|
+
|
|
+ if (high > lvts_ctrl->high_thresh)
|
|
+ return true;
|
|
+
|
|
+ for (i = 0; i < lvts_ctrl->num_lvts_sensor; i++)
|
|
+ if (lvts_ctrl->sensors[i].high_thresh == lvts_ctrl->high_thresh
|
|
+ && lvts_ctrl->sensors[i].low_thresh == lvts_ctrl->low_thresh)
|
|
+ return false;
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
static int lvts_set_trips(struct thermal_zone_device *tz, int low, int high)
|
|
{
|
|
struct lvts_sensor *lvts_sensor = thermal_zone_device_priv(tz);
|
|
+ struct lvts_ctrl *lvts_ctrl = container_of(lvts_sensor, struct lvts_ctrl, sensors[lvts_sensor->id]);
|
|
void __iomem *base = lvts_sensor->base;
|
|
u32 raw_low = lvts_temp_to_raw(low != -INT_MAX ? low : LVTS_MINIMUM_THRESHOLD);
|
|
u32 raw_high = lvts_temp_to_raw(high);
|
|
+ bool should_update_thresh;
|
|
+
|
|
+ lvts_sensor->low_thresh = low;
|
|
+ lvts_sensor->high_thresh = high;
|
|
+
|
|
+ should_update_thresh = lvts_should_update_thresh(lvts_ctrl, high);
|
|
+ if (should_update_thresh) {
|
|
+ lvts_ctrl->high_thresh = high;
|
|
+ lvts_ctrl->low_thresh = low;
|
|
+ }
|
|
+ lvts_update_irq_mask(lvts_ctrl);
|
|
+
|
|
+ if (!should_update_thresh)
|
|
+ return 0;
|
|
|
|
/*
|
|
* Low offset temperature threshold
|
|
@@ -521,6 +584,9 @@ static int lvts_sensor_init(struct devic
|
|
*/
|
|
lvts_sensor[i].msr = lvts_ctrl_data->mode == LVTS_MSR_IMMEDIATE_MODE ?
|
|
imm_regs[i] : msr_regs[i];
|
|
+
|
|
+ lvts_sensor[i].low_thresh = INT_MIN;
|
|
+ lvts_sensor[i].high_thresh = INT_MIN;
|
|
};
|
|
|
|
lvts_ctrl->num_lvts_sensor = lvts_ctrl_data->num_lvts_sensor;
|
|
@@ -688,6 +754,9 @@ static int lvts_ctrl_init(struct device
|
|
*/
|
|
lvts_ctrl[i].hw_tshut_raw_temp =
|
|
lvts_temp_to_raw(lvts_data->lvts_ctrl[i].hw_tshut_temp);
|
|
+
|
|
+ lvts_ctrl[i].low_thresh = INT_MIN;
|
|
+ lvts_ctrl[i].high_thresh = INT_MIN;
|
|
}
|
|
|
|
/*
|