[PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Marek Vasut]

The Working Sample R-Car SoCs may not yet have thermal sensor trimming
values programmed into fuses, those fuses are blank instead. For such
SoCs, the driver includes fallback trimming values. Those values are
currently applied to all SoCs which use this driver.

Introduce support for per-SoC fallback trimming values in preparation
for SoCs which do not use these current trimming values. No functional
change is intended here.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
---
Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Lukasz Luba <lukasz.luba@arm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
---
V2: - :%s@\<rcar_gen3_thermal_fuse_default_info\>@rcar_gen3_thermal_fuse_default@g
    - Put rcar_gen3_thermal_fuse_default_info_gen3 on single line
    - Add RB from Niklas
---
 drivers/thermal/renesas/rcar_gen3_thermal.c | 41 ++++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/drivers/thermal/renesas/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
index 24a702ee4c1f..413b373523e4 100644
--- a/drivers/thermal/renesas/rcar_gen3_thermal.c
+++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
@@ -73,11 +73,17 @@ struct rcar_gen3_thermal_fuse_info {
 	u32 mask;
 };
 
+struct rcar_gen3_thermal_fuse_default {
+	u32 ptat[3];
+	u32 thcodes[TSC_MAX_NUM][3];
+};
+
 struct rcar_thermal_info {
 	int scale;
 	int adj_below;
 	int adj_above;
 	const struct rcar_gen3_thermal_fuse_info *fuses;
+	const struct rcar_gen3_thermal_fuse_default *fuse_defaults;
 };
 
 struct equation_set_coef {
@@ -289,6 +295,7 @@ static void rcar_gen3_thermal_fetch_fuses(struct rcar_gen3_thermal_priv *priv)
 
 static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv)
 {
+	const struct rcar_gen3_thermal_fuse_default *fuse_defaults = priv->info->fuse_defaults;
 	unsigned int i;
 	u32 thscp;
 
@@ -297,24 +304,16 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv)
 	if (!priv->info->fuses ||
 	    (thscp & THSCP_COR_PARA_VLD) != THSCP_COR_PARA_VLD) {
 		/* Default THCODE values in case FUSEs are not set. */
-		static const int thcodes[TSC_MAX_NUM][3] = {
-			{ 3397, 2800, 2221 },
-			{ 3393, 2795, 2216 },
-			{ 3389, 2805, 2237 },
-			{ 3415, 2694, 2195 },
-			{ 3356, 2724, 2244 },
-		};
-
-		priv->ptat[0] = 2631;
-		priv->ptat[1] = 1509;
-		priv->ptat[2] = 435;
+		priv->ptat[0] = fuse_defaults->ptat[0];
+		priv->ptat[1] = fuse_defaults->ptat[1];
+		priv->ptat[2] = fuse_defaults->ptat[2];
 
 		for (i = 0; i < priv->num_tscs; i++) {
 			struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i];
 
-			tsc->thcode[0] = thcodes[i][0];
-			tsc->thcode[1] = thcodes[i][1];
-			tsc->thcode[2] = thcodes[i][2];
+			tsc->thcode[0] = fuse_defaults->thcodes[i][0];
+			tsc->thcode[1] = fuse_defaults->thcodes[i][1];
+			tsc->thcode[2] = fuse_defaults->thcodes[i][2];
 		}
 
 		return false;
@@ -361,11 +360,23 @@ static const struct rcar_gen3_thermal_fuse_info rcar_gen3_thermal_fuse_info_gen4
 	.mask = GEN4_FUSE_MASK,
 };
 
+static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_gen3 = {
+	.ptat = { 2631, 1509, 435 },
+	.thcodes = {
+		{ 3397, 2800, 2221 },
+		{ 3393, 2795, 2216 },
+		{ 3389, 2805, 2237 },
+		{ 3415, 2694, 2195 },
+		{ 3356, 2724, 2244 },
+	},
+};
+
 static const struct rcar_thermal_info rcar_m3w_thermal_info = {
 	.scale = 157,
 	.adj_below = -41,
 	.adj_above = 116,
 	.fuses = &rcar_gen3_thermal_fuse_info_gen3,
+	.fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
 };
 
 static const struct rcar_thermal_info rcar_gen3_thermal_info = {
@@ -373,6 +384,7 @@ static const struct rcar_thermal_info rcar_gen3_thermal_info = {
 	.adj_below = -41,
 	.adj_above = 126,
 	.fuses = &rcar_gen3_thermal_fuse_info_gen3,
+	.fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
 };
 
 static const struct rcar_thermal_info rcar_gen4_thermal_info = {
@@ -380,6 +392,7 @@ static const struct rcar_thermal_info rcar_gen4_thermal_info = {
 	.adj_below = -41,
 	.adj_above = 126,
 	.fuses = &rcar_gen3_thermal_fuse_info_gen4,
+	.fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
 };
 
 static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
-- 
2.47.2

[PATCH v2 2/2] thermal: rcar_gen3: Add support for R-Car V4H default trim values

[Marek Vasut]

Add default trimming values for the four temperature sensors located
in Renesas R-Car V4H Working Sample SoC. The trimming values are
identical for all four THS temperature sensors.

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
---
Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Lukasz Luba <lukasz.luba@arm.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org
---
V2: - :%s@\<rcar_gen3_thermal_fuse_default_info\>@rcar_gen3_thermal_fuse_default@g
    - Put rcar_gen3_thermal_fuse_default_info_v4h on single line
    - Add RB from Niklas
---
 drivers/thermal/renesas/rcar_gen3_thermal.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/renesas/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
index 413b373523e4..01858e72f4e0 100644
--- a/drivers/thermal/renesas/rcar_gen3_thermal.c
+++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
@@ -371,6 +371,16 @@ static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_defaul
 	},
 };
 
+static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_v4h = {
+	.ptat = { 3274, 2164, 985 },
+	.thcodes = { /* All four THS units share the same trimming */
+		{ 3218, 2617, 1980 },
+		{ 3218, 2617, 1980 },
+		{ 3218, 2617, 1980 },
+		{ 3218, 2617, 1980 },
+	}
+};
+
 static const struct rcar_thermal_info rcar_m3w_thermal_info = {
 	.scale = 157,
 	.adj_below = -41,
@@ -395,6 +405,14 @@ static const struct rcar_thermal_info rcar_gen4_thermal_info = {
 	.fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
 };
 
+static const struct rcar_thermal_info rcar_v4h_thermal_info = {
+	.scale = 167,
+	.adj_below = -41,
+	.adj_above = 126,
+	.fuses = &rcar_gen3_thermal_fuse_info_gen4,
+	.fuse_defaults = &rcar_gen3_thermal_fuse_default_info_v4h,
+};
+
 static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
 	{
 		.compatible = "renesas,r8a774a1-thermal",
@@ -438,7 +456,7 @@ static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
 	},
 	{
 		.compatible = "renesas,r8a779g0-thermal",
-		.data = &rcar_gen4_thermal_info,
+		.data = &rcar_v4h_thermal_info,
 	},
 	{
 		.compatible = "renesas,r8a779h0-thermal",
-- 
2.47.2

Re: [PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Daniel Lezcano]

On 25/06/2025 20:16, Marek Vasut wrote:
> The Working Sample R-Car SoCs may not yet have thermal sensor trimming
> values programmed into fuses, those fuses are blank instead. For such
> SoCs, the driver includes fallback trimming values. Those values are
> currently applied to all SoCs which use this driver.
> 
> Introduce support for per-SoC fallback trimming values in preparation
> for SoCs which do not use these current trimming values. No functional
> change is intended here.
> 
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
> ---
> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>

Applied, thanks


-- 
<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

Re: [PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Marek Vasut]

On 8/1/25 11:59 AM, Daniel Lezcano wrote:
> On 25/06/2025 20:16, Marek Vasut wrote:
>> The Working Sample R-Car SoCs may not yet have thermal sensor trimming
>> values programmed into fuses, those fuses are blank instead. For such
>> SoCs, the driver includes fallback trimming values. Those values are
>> currently applied to all SoCs which use this driver.
>>
>> Introduce support for per-SoC fallback trimming values in preparation
>> for SoCs which do not use these current trimming values. No functional
>> change is intended here.
>>
>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>> Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
>> ---
>> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
> 
> Applied, thanks
Is this series supposed to be in linux-next by now ?

I don't see it either on git.kernel.org thermal group tree or your tree, 
where was the series applied to ?

Thank you

Re: [PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Daniel Lezcano]

On 13/08/2025 22:37, Marek Vasut wrote:
> On 8/1/25 11:59 AM, Daniel Lezcano wrote:
>> On 25/06/2025 20:16, Marek Vasut wrote:
>>> The Working Sample R-Car SoCs may not yet have thermal sensor trimming
>>> values programmed into fuses, those fuses are blank instead. For such
>>> SoCs, the driver includes fallback trimming values. Those values are
>>> currently applied to all SoCs which use this driver.
>>>
>>> Introduce support for per-SoC fallback trimming values in preparation
>>> for SoCs which do not use these current trimming values. No functional
>>> change is intended here.
>>>
>>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
>>> ---
>>> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
>>
>> Applied, thanks
> Is this series supposed to be in linux-next by now ?
> 
> I don't see it either on git.kernel.org thermal group tree or your tree, 
> where was the series applied to ?


Sorry I did push the branch.

It is in the thermal bleeding-edge branch now and will go to linux-next 
in a couple of days


-- 
<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

Re: [PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Marek Vasut]

On 8/14/25 12:00 AM, Daniel Lezcano wrote:
> On 13/08/2025 22:37, Marek Vasut wrote:
>> On 8/1/25 11:59 AM, Daniel Lezcano wrote:
>>> On 25/06/2025 20:16, Marek Vasut wrote:
>>>> The Working Sample R-Car SoCs may not yet have thermal sensor trimming
>>>> values programmed into fuses, those fuses are blank instead. For such
>>>> SoCs, the driver includes fallback trimming values. Those values are
>>>> currently applied to all SoCs which use this driver.
>>>>
>>>> Introduce support for per-SoC fallback trimming values in preparation
>>>> for SoCs which do not use these current trimming values. No functional
>>>> change is intended here.
>>>>
>>>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
>>>> ---
>>>> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
>>>
>>> Applied, thanks
>> Is this series supposed to be in linux-next by now ?
>>
>> I don't see it either on git.kernel.org thermal group tree or your 
>> tree, where was the series applied to ?
> 
> 
> Sorry I did push the branch.
> 
> It is in the thermal bleeding-edge branch now and will go to linux-next 
> in a couple of days
Nice, thank you !

Re: [PATCH v2 1/2] thermal: rcar_gen3: Add support for per-SoC default trim values

[Marek Vasut]

On 8/14/25 12:00 AM, Daniel Lezcano wrote:
> On 13/08/2025 22:37, Marek Vasut wrote:
>> On 8/1/25 11:59 AM, Daniel Lezcano wrote:
>>> On 25/06/2025 20:16, Marek Vasut wrote:
>>>> The Working Sample R-Car SoCs may not yet have thermal sensor trimming
>>>> values programmed into fuses, those fuses are blank instead. For such
>>>> SoCs, the driver includes fallback trimming values. Those values are
>>>> currently applied to all SoCs which use this driver.
>>>>
>>>> Introduce support for per-SoC fallback trimming values in preparation
>>>> for SoCs which do not use these current trimming values. No functional
>>>> change is intended here.
>>>>
>>>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
>>>> ---
>>>> Cc: "Niklas Söderlund" <niklas.soderlund@ragnatech.se>
>>>
>>> Applied, thanks
>> Is this series supposed to be in linux-next by now ?
>>
>> I don't see it either on git.kernel.org thermal group tree or your 
>> tree, where was the series applied to ?
> 
> 
> Sorry I did push the branch.
> 
> It is in the thermal bleeding-edge branch now and will go to linux-next 
> in a couple of days
This still didn't show up in next/master , did something go wrong ?