| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251110094113.3965182-3-hanchien.lin@mediatek.com>
Date: Mon, 10 Nov 2025 17:40:39 +0800
From: Hanchien Lin <hanchien.lin@...iatek.com>
To: "Rafael J . Wysocki" <rafael@...nel.org>, Daniel Lezcano
<daniel.lezcano@...aro.org>, Zhang Rui <rui.zhang@...el.com>, Lukasz Luba
<lukasz.luba@....com>, Rob Herring <robh@...nel.org>, Krzysztof Kozlowski
<krzk+dt@...nel.org>, Conor Dooley <conor+dt@...nel.org>, Philipp Zabel
<p.zabel@...gutronix.de>, Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>, Balsam
CHIHI <bchihi@...libre.com>
CC: <linux-pm@...r.kernel.org>, <devicetree@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <linux-arm-kernel@...ts.infradead.org>,
<linux-mediatek@...ts.infradead.org>, <hanchien.lin@...iatek.com>,
<Project_Global_Chrome_Upstream_Group@...iatek.com>,
<raymond.sun@...iatek.com>, <Irving-CH.lin@...iatek.com>
Subject: [PATCH 2/2] thermal/drivers/mediatek/lvts_thermal: Add MT8189 support
Add support for the MediaTek MT8189 SoC to the LVTS thermal driver.
Signed-off-by: Hanchien Lin <hanchien.lin@...iatek.com>
---
drivers/thermal/mediatek/lvts_thermal.c | 155 ++++++++++++++++++++++--
1 file changed, 144 insertions(+), 11 deletions(-)
diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c
index ab55b20cda47..8c15fdaac48c 100644
--- a/drivers/thermal/mediatek/lvts_thermal.c
+++ b/drivers/thermal/mediatek/lvts_thermal.c
@@ -65,6 +65,7 @@
#define LVTS_HW_FILTER 0x0
#define LVTS_TSSEL_CONF 0x13121110
#define LVTS_CALSCALE_CONF 0x300
+#define LVTS_MONINT_CONF_STAGE3 BIT(31)
#define LVTS_MONINT_OFFSET_HIGH_INTEN_SENSOR0 BIT(3)
#define LVTS_MONINT_OFFSET_HIGH_INTEN_SENSOR1 BIT(8)
@@ -107,6 +108,7 @@ struct lvts_sensor_data {
struct lvts_ctrl_data {
struct lvts_sensor_data lvts_sensor[LVTS_SENSOR_MAX];
u8 valid_sensor_mask;
+ int hw_tshut_temp;
int offset;
int mode;
};
@@ -134,6 +136,9 @@ struct lvts_data {
int temp_offset;
int gt_calib_bit_offset;
unsigned int def_calibration;
+ bool clock_gate_no_need;
+ bool reset_no_need;
+ bool conf_stage3_need;
};
struct lvts_sensor {
@@ -150,6 +155,7 @@ struct lvts_ctrl {
struct lvts_sensor sensors[LVTS_SENSOR_MAX];
const struct lvts_data *lvts_data;
u32 calibration[LVTS_SENSOR_MAX];
+ u32 hw_tshut_raw_temp;
u8 valid_sensor_mask;
int mode;
void __iomem *base;
@@ -859,6 +865,14 @@ static int lvts_ctrl_init(struct device *dev, struct lvts_domain *lvts_td,
*/
lvts_ctrl[i].mode = lvts_data->lvts_ctrl[i].mode;
+ /*
+ * The temperature to raw temperature must be done
+ * after initializing the calibration.
+ */
+ lvts_ctrl[i].hw_tshut_raw_temp =
+ lvts_temp_to_raw(lvts_data->lvts_ctrl[i].hw_tshut_temp,
+ lvts_data->temp_factor);
+
lvts_ctrl[i].low_thresh = INT_MIN;
lvts_ctrl[i].high_thresh = INT_MIN;
}
@@ -919,7 +933,7 @@ static void lvts_write_config(struct lvts_ctrl *lvts_ctrl, const u32 *cmds, int
}
}
-static int lvts_irq_init(struct lvts_ctrl *lvts_ctrl)
+static int lvts_irq_init(struct lvts_ctrl *lvts_ctrl, const struct lvts_data *lvts_data)
{
/*
* LVTS_PROTCTL : Thermal Protection Sensor Selection
@@ -947,6 +961,7 @@ static int lvts_irq_init(struct lvts_ctrl *lvts_ctrl)
* writel(0x0, LVTS_PROTTB(lvts_ctrl->base));
* writel(0x0, LVTS_PROTTC(lvts_ctrl->base));
*/
+ writel(lvts_ctrl->hw_tshut_raw_temp, LVTS_PROTTC(lvts_ctrl->base));
/*
* LVTS_MONINT : Interrupt configuration register
@@ -954,7 +969,10 @@ static int lvts_irq_init(struct lvts_ctrl *lvts_ctrl)
* The LVTS_MONINT register layout is the same as the LVTS_MONINTSTS
* register, except we set the bits to enable the interrupt.
*/
- writel(0, LVTS_MONINT(lvts_ctrl->base));
+ if (lvts_data->conf_stage3_need)
+ writel(LVTS_MONINT_CONF_STAGE3, LVTS_MONINT(lvts_ctrl->base));
+ else
+ writel(0, LVTS_MONINT(lvts_ctrl->base));
return 0;
}
@@ -1041,7 +1059,8 @@ static int lvts_ctrl_calibrate(struct device *dev, struct lvts_ctrl *lvts_ctrl)
return 0;
}
-static int lvts_ctrl_configure(struct device *dev, struct lvts_ctrl *lvts_ctrl)
+static int lvts_ctrl_configure(struct device *dev, struct lvts_ctrl *lvts_ctrl,
+ const struct lvts_data *lvts_data)
{
u32 value;
@@ -1143,7 +1162,7 @@ static int lvts_ctrl_configure(struct device *dev, struct lvts_ctrl *lvts_ctrl)
value = LVTS_FILTER_INTERVAL << 16 | LVTS_SENSOR_INTERVAL;
writel(value, LVTS_MONCTL2(lvts_ctrl->base));
- return lvts_irq_init(lvts_ctrl);
+ return lvts_irq_init(lvts_ctrl, lvts_data);
}
static int lvts_ctrl_start(struct device *dev, struct lvts_ctrl *lvts_ctrl)
@@ -1290,7 +1309,7 @@ static int lvts_domain_init(struct device *dev, struct lvts_domain *lvts_td,
return ret;
}
- ret = lvts_ctrl_configure(dev, lvts_ctrl);
+ ret = lvts_ctrl_configure(dev, lvts_ctrl, lvts_data);
if (ret) {
dev_dbg(dev, "Failed to configure controller");
return ret;
@@ -1322,9 +1341,15 @@ static int lvts_probe(struct platform_device *pdev)
if (!lvts_data)
return -ENODEV;
- lvts_td->clk = devm_clk_get_enabled(dev, NULL);
- if (IS_ERR(lvts_td->clk))
- return dev_err_probe(dev, PTR_ERR(lvts_td->clk), "Failed to retrieve clock\n");
+ if (!lvts_data->clock_gate_no_need) {
+ lvts_td->clk = devm_clk_get_enabled(dev, NULL);
+ if (IS_ERR(lvts_td->clk))
+ return dev_err_probe(
+ dev,
+ PTR_ERR(lvts_td->clk),
+ "Failed to retrieve clock\n"
+ );
+ }
res = platform_get_mem_or_io(pdev, 0);
if (!res)
@@ -1334,9 +1359,15 @@ static int lvts_probe(struct platform_device *pdev)
if (IS_ERR(lvts_td->base))
return dev_err_probe(dev, PTR_ERR(lvts_td->base), "Failed to map io resource\n");
- lvts_td->reset = devm_reset_control_get_by_index(dev, 0);
- if (IS_ERR(lvts_td->reset))
- return dev_err_probe(dev, PTR_ERR(lvts_td->reset), "Failed to get reset control\n");
+ if (!lvts_data->reset_no_need) {
+ lvts_td->reset = devm_reset_control_get_by_index(dev, 0);
+ if (IS_ERR(lvts_td->reset))
+ return dev_err_probe(
+ dev,
+ PTR_ERR(lvts_td->reset),
+ "Failed to get reset control\n"
+ );
+ }
irq = platform_get_irq(pdev, 0);
if (irq < 0)
@@ -1586,6 +1617,78 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = {
}
};
+static const struct lvts_ctrl_data mt8189_lvts_mcu_data_ctrl[] = {
+ {
+ .lvts_sensor = {
+ { .dt_id = MT8189_MCU_LITTLE_CPU1,
+ .cal_offsets = { 4, 5, 6 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU2,
+ .cal_offsets = { 8, 9, 10 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU3,
+ .cal_offsets = { 12, 13, 14 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU4,
+ .cal_offsets = { 16, 17, 18 } }
+ },
+ VALID_SENSOR_MAP(1, 1, 1, 1),
+ .offset = 0x0,
+ },
+ {
+ .lvts_sensor = {
+ { .dt_id = MT8189_MCU_LITTLE_CPU5,
+ .cal_offsets = { 24, 25, 26 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU6,
+ .cal_offsets = { 28, 29, 30 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU7,
+ .cal_offsets = { 32, 33, 34 } },
+ { .dt_id = MT8189_MCU_LITTLE_CPU8,
+ .cal_offsets = { 36, 37, 38 } }
+ },
+ VALID_SENSOR_MAP(1, 1, 1, 1),
+ .offset = 0x100,
+ },
+ {
+ .lvts_sensor = {
+ { .dt_id = MT8189_MCU_BIG_CPU1,
+ .cal_offsets = { 44, 45, 46 } },
+ { .dt_id = MT8189_MCU_BIG_CPU2,
+ .cal_offsets = { 48, 49, 50 } },
+ { .dt_id = MT8189_MCU_BIG_CPU3,
+ .cal_offsets = { 52, 53, 54 } },
+ { .dt_id = MT8189_MCU_BIG_CPU4,
+ .cal_offsets = { 56, 57, 58 } }
+ },
+ VALID_SENSOR_MAP(1, 1, 1, 1),
+ .offset = 0x200,
+ }
+};
+
+static const struct lvts_ctrl_data mt8189_lvts_ap_data_ctrl[] = {
+ {
+ .lvts_sensor = {
+ { .dt_id = MT8189_AP_SOC1,
+ .cal_offsets = { 64, 65, 66 } },
+ { .dt_id = MT8189_AP_SOC2,
+ .cal_offsets = { 68, 69, 70 } },
+ { .dt_id = MT8189_AP_SOC3,
+ .cal_offsets = { 72, 73, 74 } },
+ { .dt_id = MT8189_AP_APU,
+ .cal_offsets = { 76, 77, 78 } }
+ },
+ VALID_SENSOR_MAP(1, 1, 1, 1),
+ .offset = 0x0,
+ },
+ {
+ .lvts_sensor = {
+ { .dt_id = MT8189_AP_GPU1,
+ .cal_offsets = { 84, 85, 86 } },
+ { .dt_id = MT8189_AP_GPU2,
+ .cal_offsets = { 88, 89, 90 } }
+ },
+ VALID_SENSOR_MAP(1, 1, 0, 0),
+ .offset = 0x100,
+ }
+};
+
static const struct lvts_ctrl_data mt8192_lvts_mcu_data_ctrl[] = {
{
.lvts_sensor = {
@@ -1804,6 +1907,34 @@ static const struct lvts_data mt8188_lvts_ap_data = {
.def_calibration = 35000,
};
+static const struct lvts_data mt8189_lvts_ap_data = {
+ .lvts_ctrl = mt8189_lvts_ap_data_ctrl,
+ .conn_cmd = default_conn_cmds,
+ .init_cmd = default_init_cmds,
+ .num_lvts_ctrl = ARRAY_SIZE(mt8189_lvts_ap_data_ctrl),
+ .num_conn_cmd = ARRAY_SIZE(default_conn_cmds),
+ .num_init_cmd = ARRAY_SIZE(default_init_cmds),
+ .temp_factor = LVTS_COEFF_A_MT8195,
+ .temp_offset = LVTS_COEFF_B_MT8195,
+ .gt_calib_bit_offset = 0,
+ .def_calibration = 35000,
+ .clock_gate_no_need = true,
+ .reset_no_need = true,
+ .conf_stage3_need = true,
+};
+
+static const struct lvts_data mt8189_lvts_mcu_data = {
+ .lvts_ctrl = mt8189_lvts_mcu_data_ctrl,
+ .num_lvts_ctrl = ARRAY_SIZE(mt8189_lvts_mcu_data_ctrl),
+ .temp_factor = LVTS_COEFF_A_MT8195,
+ .temp_offset = LVTS_COEFF_B_MT8195,
+ .gt_calib_bit_offset = 0,
+ .def_calibration = 35000,
+ .clock_gate_no_need = true,
+ .reset_no_need = true,
+ .conf_stage3_need = true,
+};
+
static const struct lvts_data mt8192_lvts_mcu_data = {
.lvts_ctrl = mt8192_lvts_mcu_data_ctrl,
.conn_cmd = default_conn_cmds,
@@ -1861,6 +1992,8 @@ static const struct of_device_id lvts_of_match[] = {
{ .compatible = "mediatek,mt8186-lvts", .data = &mt8186_lvts_data },
{ .compatible = "mediatek,mt8188-lvts-mcu", .data = &mt8188_lvts_mcu_data },
{ .compatible = "mediatek,mt8188-lvts-ap", .data = &mt8188_lvts_ap_data },
+ { .compatible = "mediatek,mt8189-lvts-mcu", .data = &mt8189_lvts_mcu_data },
+ { .compatible = "mediatek,mt8189-lvts-ap", .data = &mt8189_lvts_ap_data },
{ .compatible = "mediatek,mt8192-lvts-mcu", .data = &mt8192_lvts_mcu_data },
{ .compatible = "mediatek,mt8192-lvts-ap", .data = &mt8192_lvts_ap_data },
{ .compatible = "mediatek,mt8195-lvts-mcu", .data = &mt8195_lvts_mcu_data },
--
2.45.2
Powered by blists - more mailing lists