Some of the tsens IP like the one in IPQ5018 does not have a
RPM in the soc. Hence the early init to enable tsens would not
be done. So add a flag for that in feat and skip enable checks.

Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
---
 drivers/thermal/qcom/tsens.c | 2 +-
 drivers/thermal/qcom/tsens.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 98c356acfe98..f39495b61952 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -974,7 +974,7 @@ int __init init_common(struct tsens_priv *priv)
 	ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
 	if (ret)
 		goto err_put_device;
-	if (!enabled) {
+	if (!enabled && !(priv->feat->no_early_init)) {
 		dev_err(dev, "%s: device not enabled\n", __func__);
 		ret = -ENODEV;
 		goto err_put_device;
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 2805de1c6827..fb73e3dd0de9 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -505,6 +505,8 @@ enum regfield_ids {
  * @srot_split: does the IP neatly splits the register space into SROT and TM,
  *              with SROT only being available to secure boot firmware?
  * @has_watchdog: does this IP support watchdog functionality?
+ * @no_early_init: does this IP reside in a soc that does not have rpm to
+ *                 do pre-init.
  * @max_sensors: maximum sensors supported by this version of the IP
  * @trip_min_temp: minimum trip temperature supported by this version of the IP
  * @trip_max_temp: maximum trip temperature supported by this version of the IP
@@ -516,6 +518,7 @@ struct tsens_features {
 	unsigned int adc:1;
 	unsigned int srot_split:1;
 	unsigned int has_watchdog:1;
+	unsigned int no_early_init:1;
 	unsigned int max_sensors;
 	int trip_min_temp;
 	int trip_max_temp;
-- 
2.34.1

On Mon, 28 Aug 2023 at 22:20, Sricharan Ramabadhran
<quic_srichara@quicinc.com> wrote:
>
> Some of the tsens IP like the one in IPQ5018 does not have a
> RPM in the soc. Hence the early init to enable tsens would not

Tsens IP doesn't have RPM. Please rephrase this.

> be done. So add a flag for that in feat and skip enable checks.
>
> Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
> ---
>  drivers/thermal/qcom/tsens.c | 2 +-
>  drivers/thermal/qcom/tsens.h | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index 98c356acfe98..f39495b61952 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -974,7 +974,7 @@ int __init init_common(struct tsens_priv *priv)
>         ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
>         if (ret)
>                 goto err_put_device;
> -       if (!enabled) {
> +       if (!enabled && !(priv->feat->no_early_init)) {
>                 dev_err(dev, "%s: device not enabled\n", __func__);
>                 ret = -ENODEV;
>                 goto err_put_device;
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index 2805de1c6827..fb73e3dd0de9 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -505,6 +505,8 @@ enum regfield_ids {
>   * @srot_split: does the IP neatly splits the register space into SROT and TM,
>   *              with SROT only being available to secure boot firmware?
>   * @has_watchdog: does this IP support watchdog functionality?
> + * @no_early_init: does this IP reside in a soc that does not have rpm to
> + *                 do pre-init.
>   * @max_sensors: maximum sensors supported by this version of the IP
>   * @trip_min_temp: minimum trip temperature supported by this version of the IP
>   * @trip_max_temp: maximum trip temperature supported by this version of the IP
> @@ -516,6 +518,7 @@ struct tsens_features {
>         unsigned int adc:1;
>         unsigned int srot_split:1;
>         unsigned int has_watchdog:1;
> +       unsigned int no_early_init:1;

s/no_early_init/ignore_enable/

>         unsigned int max_sensors;
>         int trip_min_temp;
>         int trip_max_temp;
> --
> 2.34.1
>


-- 
With best wishes
Dmitry

Hi Dmitry,

On 8/29/2023 2:47 AM, Dmitry Baryshkov wrote:
> On Mon, 28 Aug 2023 at 22:20, Sricharan Ramabadhran
> <quic_srichara@quicinc.com> wrote:
>>
>> Some of the tsens IP like the one in IPQ5018 does not have a
>> RPM in the soc. Hence the early init to enable tsens would not
> 
> Tsens IP doesn't have RPM. Please rephrase this.
> 

  ok.

>> be done. So add a flag for that in feat and skip enable checks.
>>
>> Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
>> ---
>>   drivers/thermal/qcom/tsens.c | 2 +-
>>   drivers/thermal/qcom/tsens.h | 3 +++
>>   2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
>> index 98c356acfe98..f39495b61952 100644
>> --- a/drivers/thermal/qcom/tsens.c
>> +++ b/drivers/thermal/qcom/tsens.c
>> @@ -974,7 +974,7 @@ int __init init_common(struct tsens_priv *priv)
>>          ret = regmap_field_read(priv->rf[TSENS_EN], &enabled);
>>          if (ret)
>>                  goto err_put_device;
>> -       if (!enabled) {
>> +       if (!enabled && !(priv->feat->no_early_init)) {
>>                  dev_err(dev, "%s: device not enabled\n", __func__);
>>                  ret = -ENODEV;
>>                  goto err_put_device;
>> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
>> index 2805de1c6827..fb73e3dd0de9 100644
>> --- a/drivers/thermal/qcom/tsens.h
>> +++ b/drivers/thermal/qcom/tsens.h
>> @@ -505,6 +505,8 @@ enum regfield_ids {
>>    * @srot_split: does the IP neatly splits the register space into SROT and TM,
>>    *              with SROT only being available to secure boot firmware?
>>    * @has_watchdog: does this IP support watchdog functionality?
>> + * @no_early_init: does this IP reside in a soc that does not have rpm to
>> + *                 do pre-init.
>>    * @max_sensors: maximum sensors supported by this version of the IP
>>    * @trip_min_temp: minimum trip temperature supported by this version of the IP
>>    * @trip_max_temp: maximum trip temperature supported by this version of the IP
>> @@ -516,6 +518,7 @@ struct tsens_features {
>>          unsigned int adc:1;
>>          unsigned int srot_split:1;
>>          unsigned int has_watchdog:1;
>> +       unsigned int no_early_init:1;
> 
> s/no_early_init/ignore_enable/
> 

  ok, will change.

Regards,
  Sricharan