This patchset adds thermal support for MT8365 SoC.
MT8365 has 4 thermal sensors, one for CPUs and the rest for debug/dev
purposes. The CPU thermal zone uses passive cooling device with
CPU{0..3}.
Changes in v9:
- Use delay between bank init and the thermal zone device register.
- Link to v8: https://lore.kernel.org/r/[email protected]
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
---
Amjad Ouled-Ameur (2):
thermal: mediatek: add callback for raw to mcelsius conversion
thermal: mediatek: add delay after thermal banks initialization
Fabien Parent (2):
dt-bindings: thermal: mediatek: add binding documentation for MT8365 SoC
thermal: mediatek: add support for MT8365 SoC
Markus Schneider-Pargmann (1):
thermal: mediatek: control buffer enablement tweaks
.../bindings/thermal/mediatek-thermal.txt | 1 +
drivers/thermal/mtk_thermal.c | 117 +++++++++++++++++----
2 files changed, 96 insertions(+), 22 deletions(-)
---
base-commit: a2c81dc59d41e92362ab7d41d0c15471ea50637d
change-id: 20221018-up-i350-thermal-bringup-ad386d37056f
Best regards,
--
Amjad Ouled-Ameur <[email protected]>
From: Markus Schneider-Pargmann <[email protected]>
Add logic in order to be able to turn on the control buffer on MT8365.
This change now allows to have control buffer support for MTK_THERMAL_V1,
and it allows to define the register offset, and mask used to enable it.
Signed-off-by: Markus Schneider-Pargmann <[email protected]>
Signed-off-by: Fabien Parent <[email protected]>
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 8440692e3890..d8ddceb75372 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -271,6 +271,9 @@ struct mtk_thermal_data {
bool need_switch_bank;
struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
enum mtk_thermal_version version;
+ u32 apmixed_buffer_ctl_reg;
+ u32 apmixed_buffer_ctl_mask;
+ u32 apmixed_buffer_ctl_set;
};
struct mtk_thermal {
@@ -514,6 +517,9 @@ static const struct mtk_thermal_data mt7622_thermal_data = {
.adcpnp = mt7622_adcpnp,
.sensor_mux_values = mt7622_mux_values,
.version = MTK_THERMAL_V2,
+ .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
+ .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
+ .apmixed_buffer_ctl_set = BIT(0),
};
/*
@@ -963,14 +969,18 @@ static const struct of_device_id mtk_thermal_of_match[] = {
};
MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
-static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
+static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
+ void __iomem *apmixed_base)
{
- int tmp;
+ u32 tmp;
+
+ if (!mt->conf->apmixed_buffer_ctl_reg)
+ return;
- tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
- tmp &= ~(0x37);
- tmp |= 0x1;
- writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
+ tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
+ tmp &= mt->conf->apmixed_buffer_ctl_mask;
+ tmp |= mt->conf->apmixed_buffer_ctl_set;
+ writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
udelay(200);
}
@@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
goto err_disable_clk_auxadc;
}
+ mtk_thermal_turn_on_buffer(mt, apmixed_base);
+
if (mt->conf->version == MTK_THERMAL_V2) {
- mtk_thermal_turn_on_buffer(apmixed_base);
mtk_thermal_release_periodic_ts(mt, auxadc_base);
}
--
2.39.1
From: Fabien Parent <[email protected]>
Add the binding documentation for the thermal support on MT8365 SoC.
Signed-off-by: Fabien Parent <[email protected]>
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
Reviewed-by: Matthias Brugger <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
Documentation/devicetree/bindings/thermal/mediatek-thermal.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
index 38b32bb447e3..ac39c7156fde 100644
--- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
@@ -16,6 +16,7 @@ Required properties:
- "mediatek,mt7981-thermal", "mediatek,mt7986-thermal" : For MT7981 SoC
- "mediatek,mt7986-thermal" : For MT7986 SoC
- "mediatek,mt8183-thermal" : For MT8183 family of SoCs
+ - "mediatek,mt8365-thermal" : For MT8365 family of SoCs
- "mediatek,mt8516-thermal", "mediatek,mt2701-thermal : For MT8516 family of SoCs
- reg: Address range of the thermal controller
- interrupts: IRQ for the thermal controller
--
2.39.1
From: Fabien Parent <[email protected]>
MT8365 is similar to the other SoCs supported by the driver. It has only
one bank and 3 actual sensors that can be multiplexed. There is another
one sensor that does not have usable data.
Signed-off-by: Fabien Parent <[email protected]>
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/thermal/mtk_thermal.c | 68 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index d8ddceb75372..3a5df1440822 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -31,6 +31,7 @@
#define AUXADC_CON2_V 0x010
#define AUXADC_DATA(channel) (0x14 + (channel) * 4)
+#define APMIXED_SYS_TS_CON0 0x600
#define APMIXED_SYS_TS_CON1 0x604
/* Thermal Controller Registers */
@@ -245,6 +246,17 @@ enum mtk_thermal_version {
/* The calibration coefficient of sensor */
#define MT8183_CALIBRATION 153
+/* MT8365 */
+#define MT8365_TEMP_AUXADC_CHANNEL 11
+#define MT8365_CALIBRATION 164
+#define MT8365_NUM_CONTROLLER 1
+#define MT8365_NUM_BANKS 1
+#define MT8365_NUM_SENSORS 3
+#define MT8365_NUM_SENSORS_PER_ZONE 3
+#define MT8365_TS1 0
+#define MT8365_TS2 1
+#define MT8365_TS3 2
+
struct mtk_thermal;
struct thermal_bank_cfg {
@@ -389,6 +401,24 @@ static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, };
static const int mt7622_vts_index[MT7622_NUM_SENSORS] = { VTS1 };
static const int mt7622_tc_offset[MT7622_NUM_CONTROLLER] = { 0x0, };
+/* MT8365 thermal sensor data */
+static const int mt8365_bank_data[MT8365_NUM_SENSORS] = {
+ MT8365_TS1, MT8365_TS2, MT8365_TS3
+};
+
+static const int mt8365_msr[MT8365_NUM_SENSORS_PER_ZONE] = {
+ TEMP_MSR0, TEMP_MSR1, TEMP_MSR2
+};
+
+static const int mt8365_adcpnp[MT8365_NUM_SENSORS_PER_ZONE] = {
+ TEMP_ADCPNP0, TEMP_ADCPNP1, TEMP_ADCPNP2
+};
+
+static const int mt8365_mux_values[MT8365_NUM_SENSORS] = { 0, 1, 2 };
+static const int mt8365_tc_offset[MT8365_NUM_CONTROLLER] = { 0 };
+
+static const int mt8365_vts_index[MT8365_NUM_SENSORS] = { VTS1, VTS2, VTS3 };
+
/*
* The MT8173 thermal controller has four banks. Each bank can read up to
* four temperature sensors simultaneously. The MT8173 has a total of 5
@@ -463,6 +493,40 @@ static const struct mtk_thermal_data mt2701_thermal_data = {
.version = MTK_THERMAL_V1,
};
+/*
+ * The MT8365 thermal controller has one bank, which can read up to
+ * four temperature sensors simultaneously. The MT8365 has a total of 3
+ * temperature sensors.
+ *
+ * The thermal core only gets the maximum temperature of this one bank,
+ * so the bank concept wouldn't be necessary here. However, the SVS (Smart
+ * Voltage Scaling) unit makes its decisions based on the same bank
+ * data.
+ */
+static const struct mtk_thermal_data mt8365_thermal_data = {
+ .auxadc_channel = MT8365_TEMP_AUXADC_CHANNEL,
+ .num_banks = MT8365_NUM_BANKS,
+ .num_sensors = MT8365_NUM_SENSORS,
+ .vts_index = mt8365_vts_index,
+ .cali_val = MT8365_CALIBRATION,
+ .num_controller = MT8365_NUM_CONTROLLER,
+ .controller_offset = mt8365_tc_offset,
+ .need_switch_bank = false,
+ .bank_data = {
+ {
+ .num_sensors = MT8365_NUM_SENSORS,
+ .sensors = mt8365_bank_data
+ },
+ },
+ .msr = mt8365_msr,
+ .adcpnp = mt8365_adcpnp,
+ .sensor_mux_values = mt8365_mux_values,
+ .version = MTK_THERMAL_V1,
+ .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON0,
+ .apmixed_buffer_ctl_mask = (u32) ~GENMASK(29, 28),
+ .apmixed_buffer_ctl_set = 0,
+};
+
/*
* The MT2712 thermal controller has one bank, which can read up to
* four temperature sensors simultaneously. The MT2712 has a total of 4
@@ -964,6 +1028,10 @@ static const struct of_device_id mtk_thermal_of_match[] = {
{
.compatible = "mediatek,mt8183-thermal",
.data = (void *)&mt8183_thermal_data,
+ },
+ {
+ .compatible = "mediatek,mt8365-thermal",
+ .data = (void *)&mt8365_thermal_data,
}, {
},
};
--
2.39.1
Set a callback at probe time instead of checking the version at
each get_sensor_temp().
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/thermal/mtk_thermal.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 3a5df1440822..b8e06f6c7c42 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -307,6 +307,8 @@ struct mtk_thermal {
const struct mtk_thermal_data *conf;
struct mtk_thermal_bank banks[MAX_NUM_ZONES];
+
+ int (*raw_to_mcelsius)(struct mtk_thermal *mt, int sensno, s32 raw);
};
/* MT8183 thermal sensor data */
@@ -726,13 +728,7 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)
for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) {
raw = readl(mt->thermal_base + conf->msr[i]);
- if (mt->conf->version == MTK_THERMAL_V1) {
- temp = raw_to_mcelsius_v1(
- mt, conf->bank_data[bank->id].sensors[i], raw);
- } else {
- temp = raw_to_mcelsius_v2(
- mt, conf->bank_data[bank->id].sensors[i], raw);
- }
+ temp = mt->raw_to_mcelsius(mt, i, raw);
/*
* The first read of a sensor often contains very high bogus
@@ -1150,6 +1146,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
mtk_thermal_turn_on_buffer(mt, apmixed_base);
+ mt->raw_to_mcelsius = (mt->conf->version == MTK_THERMAL_V1) ?
+ raw_to_mcelsius_v1 : raw_to_mcelsius_v2;
+
if (mt->conf->version == MTK_THERMAL_V2) {
mtk_thermal_release_periodic_ts(mt, auxadc_base);
}
--
2.39.1
Thermal sensor reads performed immediately after thermal bank
initialization returns bogus values. This is currently tackled by returning
0 if the temperature is bogus (exceeding 200000).
Instead, add a delay between the bank init and the thermal zone device
register to properly fix this.
Signed-off-by: Michael Kao <[email protected]>
Signed-off-by: Hsin-Yi Wang <[email protected]>
Signed-off-by: Amjad Ouled-Ameur <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
drivers/thermal/mtk_thermal.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index b8e06f6c7c42..ab7db385afb3 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -730,14 +730,6 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)
temp = mt->raw_to_mcelsius(mt, i, raw);
- /*
- * The first read of a sensor often contains very high bogus
- * temperature value. Filter these out so that the system does
- * not immediately shut down.
- */
- if (temp > 200000)
- temp = 0;
-
if (temp > max)
max = temp;
}
@@ -1160,6 +1152,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mt);
+ // Delay for thermal banks to be ready
+ msleep(30);
+
tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt,
&mtk_thermal_ops);
if (IS_ERR(tzdev)) {
--
2.39.1
On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
> Thermal sensor reads performed immediately after thermal bank
> initialization returns bogus values. This is currently tackled by returning
> 0 if the temperature is bogus (exceeding 200000).
>
> Instead, add a delay between the bank init and the thermal zone device
> register to properly fix this.
>
> Signed-off-by: Michael Kao <[email protected]>
> Signed-off-by: Hsin-Yi Wang <[email protected]>
> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> ---
> drivers/thermal/mtk_thermal.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
> index b8e06f6c7c42..ab7db385afb3 100644
> --- a/drivers/thermal/mtk_thermal.c
> +++ b/drivers/thermal/mtk_thermal.c
> @@ -730,14 +730,6 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)
>
> temp = mt->raw_to_mcelsius(mt, i, raw);
>
> - /*
> - * The first read of a sensor often contains very high bogus
> - * temperature value. Filter these out so that the system does
> - * not immediately shut down.
> - */
> - if (temp > 200000)
> - temp = 0;
> -
> if (temp > max)
> max = temp;
> }
> @@ -1160,6 +1152,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, mt);
>
> + // Delay for thermal banks to be ready
Coding style for comments is : /* */
No need to resend, I'll take care of changing the comment format.
> + msleep(30);
> +
> tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt,
> &mtk_thermal_ops);
> if (IS_ERR(tzdev)) {
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
> From: Markus Schneider-Pargmann <[email protected]>
>
> Add logic in order to be able to turn on the control buffer on MT8365.
> This change now allows to have control buffer support for MTK_THERMAL_V1,
> and it allows to define the register offset, and mask used to enable it.
>
> Signed-off-by: Markus Schneider-Pargmann <[email protected]>
> Signed-off-by: Fabien Parent <[email protected]>
> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> ---
> drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
> 1 file changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
> index 8440692e3890..d8ddceb75372 100644
> --- a/drivers/thermal/mtk_thermal.c
> +++ b/drivers/thermal/mtk_thermal.c
> @@ -271,6 +271,9 @@ struct mtk_thermal_data {
> bool need_switch_bank;
> struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
> enum mtk_thermal_version version;
> + u32 apmixed_buffer_ctl_reg;
> + u32 apmixed_buffer_ctl_mask;
> + u32 apmixed_buffer_ctl_set;
> };
>
> struct mtk_thermal {
> @@ -514,6 +517,9 @@ static const struct mtk_thermal_data mt7622_thermal_data = {
> .adcpnp = mt7622_adcpnp,
> .sensor_mux_values = mt7622_mux_values,
> .version = MTK_THERMAL_V2,
> + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
> + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
> + .apmixed_buffer_ctl_set = BIT(0),
> };
>
> /*
> @@ -963,14 +969,18 @@ static const struct of_device_id mtk_thermal_of_match[] = {
> };
> MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
>
> -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
> +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
> + void __iomem *apmixed_base)
> {
> - int tmp;
> + u32 tmp;
> +
> + if (!mt->conf->apmixed_buffer_ctl_reg)
> + return;
>
> - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
> - tmp &= ~(0x37);
> - tmp |= 0x1;
> - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
> + tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
> + tmp &= mt->conf->apmixed_buffer_ctl_mask;
> + tmp |= mt->conf->apmixed_buffer_ctl_set;
> + writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
> udelay(200);
> }
>
> @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
> goto err_disable_clk_auxadc;
> }
>
> + mtk_thermal_turn_on_buffer(mt, apmixed_base);
> +
> if (mt->conf->version == MTK_THERMAL_V2) {
> - mtk_thermal_turn_on_buffer(apmixed_base);
> mtk_thermal_release_periodic_ts(mt, auxadc_base);
> }
This change conflicts with commit 4f2ee0aa2e706
I fixed it with:
- if (mt->conf->version != MTK_THERMAL_V1) {
- mtk_thermal_turn_on_buffer(apmixed_base);
+ mtk_thermal_turn_on_buffer(apmixed_base);
+
+ if (mt->conf->version != MTK_THERMAL_V1)
mtk_thermal_release_periodic_ts(mt, auxadc_base);
- }
Let me know if there is something wrong.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
> Set a callback at probe time instead of checking the version at
> each get_sensor_temp().
>
> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> ---
This patch has been dropped because it is duplicate of patch:
https://lore.kernel.org/r/69c17529e8418da3eec703dde31e1b01e5b0f7e8.1674055882.git.daniel@makrotopia.org
> drivers/thermal/mtk_thermal.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
> index 3a5df1440822..b8e06f6c7c42 100644
> --- a/drivers/thermal/mtk_thermal.c
> +++ b/drivers/thermal/mtk_thermal.c
> @@ -307,6 +307,8 @@ struct mtk_thermal {
>
> const struct mtk_thermal_data *conf;
> struct mtk_thermal_bank banks[MAX_NUM_ZONES];
> +
> + int (*raw_to_mcelsius)(struct mtk_thermal *mt, int sensno, s32 raw);
> };
>
> /* MT8183 thermal sensor data */
> @@ -726,13 +728,7 @@ static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank)
> for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) {
> raw = readl(mt->thermal_base + conf->msr[i]);
>
> - if (mt->conf->version == MTK_THERMAL_V1) {
> - temp = raw_to_mcelsius_v1(
> - mt, conf->bank_data[bank->id].sensors[i], raw);
> - } else {
> - temp = raw_to_mcelsius_v2(
> - mt, conf->bank_data[bank->id].sensors[i], raw);
> - }
> + temp = mt->raw_to_mcelsius(mt, i, raw);
>
> /*
> * The first read of a sensor often contains very high bogus
> @@ -1150,6 +1146,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>
> mtk_thermal_turn_on_buffer(mt, apmixed_base);
>
> + mt->raw_to_mcelsius = (mt->conf->version == MTK_THERMAL_V1) ?
> + raw_to_mcelsius_v1 : raw_to_mcelsius_v2;
> +
> if (mt->conf->version == MTK_THERMAL_V2) {
> mtk_thermal_release_periodic_ts(mt, auxadc_base);
> }
>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
> This patchset adds thermal support for MT8365 SoC.
>
> MT8365 has 4 thermal sensors, one for CPUs and the rest for debug/dev
> purposes. The CPU thermal zone uses passive cooling device with
> CPU{0..3}.
>
> Changes in v9:
> - Use delay between bank init and the thermal zone device register.
> - Link to v8: https://lore.kernel.org/r/[email protected]
>
> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
> ---
> Amjad Ouled-Ameur (2):
> thermal: mediatek: add callback for raw to mcelsius conversion
> thermal: mediatek: add delay after thermal banks initialization
>
> Fabien Parent (2):
> dt-bindings: thermal: mediatek: add binding documentation for MT8365 SoC
> thermal: mediatek: add support for MT8365 SoC
>
> Markus Schneider-Pargmann (1):
> thermal: mediatek: control buffer enablement tweaks
>
> .../bindings/thermal/mediatek-thermal.txt | 1 +
> drivers/thermal/mtk_thermal.c | 117 +++++++++++++++++----
> 2 files changed, 96 insertions(+), 22 deletions(-)
> ---
Applied, with some changes and the subject fixed:
Subject format for thermal is: thermal/drivers/<thedriver>: [A-Z]*.
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On 1/27/23 22:48, Daniel Lezcano wrote:
> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>> From: Markus Schneider-Pargmann <[email protected]>
>>
>> Add logic in order to be able to turn on the control buffer on MT8365.
>> This change now allows to have control buffer support for MTK_THERMAL_V1,
>> and it allows to define the register offset, and mask used to enable it.
>>
>> Signed-off-by: Markus Schneider-Pargmann <[email protected]>
>> Signed-off-by: Fabien Parent <[email protected]>
>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
>> ---
>> drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
>> 1 file changed, 18 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
>> index 8440692e3890..d8ddceb75372 100644
>> --- a/drivers/thermal/mtk_thermal.c
>> +++ b/drivers/thermal/mtk_thermal.c
>> @@ -271,6 +271,9 @@ struct mtk_thermal_data {
>> bool need_switch_bank;
>> struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
>> enum mtk_thermal_version version;
>> + u32 apmixed_buffer_ctl_reg;
>> + u32 apmixed_buffer_ctl_mask;
>> + u32 apmixed_buffer_ctl_set;
>> };
>> struct mtk_thermal {
>> @@ -514,6 +517,9 @@ static const struct mtk_thermal_data mt7622_thermal_data = {
>> .adcpnp = mt7622_adcpnp,
>> .sensor_mux_values = mt7622_mux_values,
>> .version = MTK_THERMAL_V2,
>> + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
>> + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
>> + .apmixed_buffer_ctl_set = BIT(0),
>> };
>> /*
>> @@ -963,14 +969,18 @@ static const struct of_device_id mtk_thermal_of_match[] = {
>> };
>> MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
>> -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
>> +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
>> + void __iomem *apmixed_base)
>> {
>> - int tmp;
>> + u32 tmp;
>> +
>> + if (!mt->conf->apmixed_buffer_ctl_reg)
>> + return;
>> - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
>> - tmp &= ~(0x37);
>> - tmp |= 0x1;
>> - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
>> + tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>> + tmp &= mt->conf->apmixed_buffer_ctl_mask;
>> + tmp |= mt->conf->apmixed_buffer_ctl_set;
>> + writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>> udelay(200);
>> }
>> @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>> goto err_disable_clk_auxadc;
>> }
>> + mtk_thermal_turn_on_buffer(mt, apmixed_base);
>> +
>> if (mt->conf->version == MTK_THERMAL_V2) {
>> - mtk_thermal_turn_on_buffer(apmixed_base);
>> mtk_thermal_release_periodic_ts(mt, auxadc_base);
>> }
>
> This change conflicts with commit 4f2ee0aa2e706
>
> I fixed it with:
>
> - if (mt->conf->version != MTK_THERMAL_V1) {
> - mtk_thermal_turn_on_buffer(apmixed_base);
> + mtk_thermal_turn_on_buffer(apmixed_base);
> +
> + if (mt->conf->version != MTK_THERMAL_V1)
> mtk_thermal_release_periodic_ts(mt, auxadc_base);
> - }
>
I think it's rather MTK_THERMAL_V2 and not MTK_THERMAL_V1. Other than that, it looks
fine by me, thanks.
Amjad
> Let me know if there is something wrong.
>
>
On 1/27/23 22:59, Daniel Lezcano wrote:
> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>> This patchset adds thermal support for MT8365 SoC.
>>
>> MT8365 has 4 thermal sensors, one for CPUs and the rest for debug/dev
>> purposes. The CPU thermal zone uses passive cooling device with
>> CPU{0..3}.
>>
>> Changes in v9:
>> - Use delay between bank init and the thermal zone device register.
>> - Link to v8: https://lore.kernel.org/r/[email protected]
>>
>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>> ---
>> Amjad Ouled-Ameur (2):
>> thermal: mediatek: add callback for raw to mcelsius conversion
>> thermal: mediatek: add delay after thermal banks initialization
>>
>> Fabien Parent (2):
>> dt-bindings: thermal: mediatek: add binding documentation for MT8365 SoC
>> thermal: mediatek: add support for MT8365 SoC
>>
>> Markus Schneider-Pargmann (1):
>> thermal: mediatek: control buffer enablement tweaks
>>
>> .../bindings/thermal/mediatek-thermal.txt | 1 +
>> drivers/thermal/mtk_thermal.c | 117 +++++++++++++++++----
>> 2 files changed, 96 insertions(+), 22 deletions(-)
>> ---
>
> Applied, with some changes and the subject fixed:
>
> Subject format for thermal is: thermal/drivers/<thedriver>: [A-Z]*.
>
> Thanks
Thank you Daniel for applying the patchset.
Kindly,
Amjad
>
> -- Daniel
>
On 27/01/2023 23:21, Amjad Ouled-Ameur wrote:
>
> On 1/27/23 22:48, Daniel Lezcano wrote:
>> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>>> From: Markus Schneider-Pargmann <[email protected]>
>>>
>>> Add logic in order to be able to turn on the control buffer on MT8365.
>>> This change now allows to have control buffer support for
>>> MTK_THERMAL_V1,
>>> and it allows to define the register offset, and mask used to enable it.
>>>
>>> Signed-off-by: Markus Schneider-Pargmann <[email protected]>
>>> Signed-off-by: Fabien Parent <[email protected]>
>>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>>> Reviewed-by: AngeloGioacchino Del Regno
>>> <[email protected]>
>>> ---
>>> drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
>>> 1 file changed, 18 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/thermal/mtk_thermal.c
>>> b/drivers/thermal/mtk_thermal.c
>>> index 8440692e3890..d8ddceb75372 100644
>>> --- a/drivers/thermal/mtk_thermal.c
>>> +++ b/drivers/thermal/mtk_thermal.c
>>> @@ -271,6 +271,9 @@ struct mtk_thermal_data {
>>> bool need_switch_bank;
>>> struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
>>> enum mtk_thermal_version version;
>>> + u32 apmixed_buffer_ctl_reg;
>>> + u32 apmixed_buffer_ctl_mask;
>>> + u32 apmixed_buffer_ctl_set;
>>> };
>>> struct mtk_thermal {
>>> @@ -514,6 +517,9 @@ static const struct mtk_thermal_data
>>> mt7622_thermal_data = {
>>> .adcpnp = mt7622_adcpnp,
>>> .sensor_mux_values = mt7622_mux_values,
>>> .version = MTK_THERMAL_V2,
>>> + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
>>> + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
>>> + .apmixed_buffer_ctl_set = BIT(0),
>>> };
>>> /*
>>> @@ -963,14 +969,18 @@ static const struct of_device_id
>>> mtk_thermal_of_match[] = {
>>> };
>>> MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
>>> -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
>>> +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
>>> + void __iomem *apmixed_base)
>>> {
>>> - int tmp;
>>> + u32 tmp;
>>> +
>>> + if (!mt->conf->apmixed_buffer_ctl_reg)
>>> + return;
>>> - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
>>> - tmp &= ~(0x37);
>>> - tmp |= 0x1;
>>> - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
>>> + tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>>> + tmp &= mt->conf->apmixed_buffer_ctl_mask;
>>> + tmp |= mt->conf->apmixed_buffer_ctl_set;
>>> + writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>>> udelay(200);
>>> }
>>> @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct
>>> platform_device *pdev)
>>> goto err_disable_clk_auxadc;
>>> }
>>> + mtk_thermal_turn_on_buffer(mt, apmixed_base);
>>> +
>>> if (mt->conf->version == MTK_THERMAL_V2) {
>>> - mtk_thermal_turn_on_buffer(apmixed_base);
>>> mtk_thermal_release_periodic_ts(mt, auxadc_base);
>>> }
>>
>> This change conflicts with commit 4f2ee0aa2e706
>>
>> I fixed it with:
>>
>> - if (mt->conf->version != MTK_THERMAL_V1) {
>> - mtk_thermal_turn_on_buffer(apmixed_base);
>> + mtk_thermal_turn_on_buffer(apmixed_base);
>> +
>> + if (mt->conf->version != MTK_THERMAL_V1)
>> mtk_thermal_release_periodic_ts(mt, auxadc_base);
>> - }
>>
> I think it's rather MTK_THERMAL_V2 and not MTK_THERMAL_V1. Other than
> that, it looks
It was before if (version == MTK_THERMAL_V2). Now there is a V3, so it
is replaced by if (version != MTK_THERMAL_V1) in order to include the V3
>> Let me know if there is something wrong.
>>
>>
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
On 1/27/23 22:59, Daniel Lezcano wrote:
> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>> This patchset adds thermal support for MT8365 SoC.
>>
>> MT8365 has 4 thermal sensors, one for CPUs and the rest for debug/dev
>> purposes. The CPU thermal zone uses passive cooling device with
>> CPU{0..3}.
>>
>> Changes in v9:
>> - Use delay between bank init and the thermal zone device register.
>> - Link to v8: https://lore.kernel.org/r/[email protected]
>>
>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>> ---
>> Amjad Ouled-Ameur (2):
>> thermal: mediatek: add callback for raw to mcelsius conversion
>> thermal: mediatek: add delay after thermal banks initialization
>>
>> Fabien Parent (2):
>> dt-bindings: thermal: mediatek: add binding documentation for MT8365 SoC
>> thermal: mediatek: add support for MT8365 SoC
>>
>> Markus Schneider-Pargmann (1):
>> thermal: mediatek: control buffer enablement tweaks
>>
>> .../bindings/thermal/mediatek-thermal.txt | 1 +
>> drivers/thermal/mtk_thermal.c | 117 +++++++++++++++++----
>> 2 files changed, 96 insertions(+), 22 deletions(-)
>> ---
>
> Applied, with some changes and the subject fixed:
>
Any news about this patchset ?
Kindly,
Amjad
> Subject format for thermal is: thermal/drivers/<thedriver>: [A-Z]*.
>
> Thanks
>
> -- Daniel
>
On 06/03/2023 11:13, Amjad Ouled-Ameur wrote:
> Hi Daniel,
>
> On 1/27/23 22:59, Daniel Lezcano wrote:
>> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>>> This patchset adds thermal support for MT8365 SoC.
>>>
>>> MT8365 has 4 thermal sensors, one for CPUs and the rest for debug/dev
>>> purposes. The CPU thermal zone uses passive cooling device with
>>> CPU{0..3}.
>>>
>>> Changes in v9:
>>> - Use delay between bank init and the thermal zone device register.
>>> - Link to v8:
>>> https://lore.kernel.org/r/[email protected]
>>>
>>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>>> ---
>>> Amjad Ouled-Ameur (2):
>>> thermal: mediatek: add callback for raw to mcelsius conversion
>>> thermal: mediatek: add delay after thermal banks initialization
>>>
>>> Fabien Parent (2):
>>> dt-bindings: thermal: mediatek: add binding documentation for
>>> MT8365 SoC
>>> thermal: mediatek: add support for MT8365 SoC
>>>
>>> Markus Schneider-Pargmann (1):
>>> thermal: mediatek: control buffer enablement tweaks
>>>
>>> .../bindings/thermal/mediatek-thermal.txt | 1 +
>>> drivers/thermal/mtk_thermal.c | 117
>>> +++++++++++++++++----
>>> 2 files changed, 96 insertions(+), 22 deletions(-)
>>> ---
>>
>> Applied, with some changes and the subject fixed:
>>
> Any news about this patchset ?
Yep, sorry for that. It will be in bleeding-edge soon.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
On 1/27/23 22:48, Daniel Lezcano wrote:
> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>> From: Markus Schneider-Pargmann <[email protected]>
>>
>> Add logic in order to be able to turn on the control buffer on MT8365.
>> This change now allows to have control buffer support for MTK_THERMAL_V1,
>> and it allows to define the register offset, and mask used to enable it.
>>
>> Signed-off-by: Markus Schneider-Pargmann <[email protected]>
>> Signed-off-by: Fabien Parent <[email protected]>
>> Signed-off-by: Amjad Ouled-Ameur <[email protected]>
>> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
>> ---
>> drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
>> 1 file changed, 18 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
>> index 8440692e3890..d8ddceb75372 100644
>> --- a/drivers/thermal/mtk_thermal.c
>> +++ b/drivers/thermal/mtk_thermal.c
>> @@ -271,6 +271,9 @@ struct mtk_thermal_data {
>> bool need_switch_bank;
>> struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
>> enum mtk_thermal_version version;
>> + u32 apmixed_buffer_ctl_reg;
>> + u32 apmixed_buffer_ctl_mask;
>> + u32 apmixed_buffer_ctl_set;
>> };
>> struct mtk_thermal {
>> @@ -514,6 +517,9 @@ static const struct mtk_thermal_data mt7622_thermal_data = {
>> .adcpnp = mt7622_adcpnp,
>> .sensor_mux_values = mt7622_mux_values,
>> .version = MTK_THERMAL_V2,
>> + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
>> + .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
>> + .apmixed_buffer_ctl_set = BIT(0),
>> };
>> /*
>> @@ -963,14 +969,18 @@ static const struct of_device_id mtk_thermal_of_match[] = {
>> };
>> MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
>> -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
>> +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
>> + void __iomem *apmixed_base)
>> {
>> - int tmp;
>> + u32 tmp;
>> +
>> + if (!mt->conf->apmixed_buffer_ctl_reg)
>> + return;
>> - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
>> - tmp &= ~(0x37);
>> - tmp |= 0x1;
>> - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
>> + tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>> + tmp &= mt->conf->apmixed_buffer_ctl_mask;
>> + tmp |= mt->conf->apmixed_buffer_ctl_set;
>> + writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>> udelay(200);
>> }
>> @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>> goto err_disable_clk_auxadc;
>> }
>> + mtk_thermal_turn_on_buffer(mt, apmixed_base);
>> +
>> if (mt->conf->version == MTK_THERMAL_V2) {
>> - mtk_thermal_turn_on_buffer(apmixed_base);
>> mtk_thermal_release_periodic_ts(mt, auxadc_base);
>> }
>
> This change conflicts with commit 4f2ee0aa2e706
>
> I fixed it with:
>
> - if (mt->conf->version != MTK_THERMAL_V1) {
> - mtk_thermal_turn_on_buffer(apmixed_base);
> + mtk_thermal_turn_on_buffer(apmixed_base);
This should rather be "mtk_thermal_turn_on_buffer(mt, apmixed_base);" as this patch
also adds mtk_thermal arg to the function.
Regards,
Amjad
> +
> + if (mt->conf->version != MTK_THERMAL_V1)
> mtk_thermal_release_periodic_ts(mt, auxadc_base);
> - }
>
> Let me know if there is something wrong.
>
>