Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1241970 > unrolled thread
| Started by | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| First post | 2015-10-08 07:40 +0200 |
| Last post | 2015-10-10 03:50 +0200 |
| Articles | 6 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-08 07:40 +0200
[PATCH 5/5] thermal: exynos: Directly return 0 instead of using local ret variable Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-08 07:40 +0200
Re: [PATCH 5/5] thermal: exynos: Directly return 0 instead of using local ret variable Alim Akhtar <alim.akhtar@gmail.com> - 2015-10-08 18:50 +0200
Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure Alim Akhtar <alim.akhtar@gmail.com> - 2015-10-08 18:50 +0200
Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure Krzysztof Kozlowski <k.kozlowski@samsung.com> - 2015-10-09 13:00 +0200
Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure Alim Akhtar <alim.akhtar@gmail.com> - 2015-10-10 03:50 +0200
| From | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| Date | 2015-10-08 07:40 +0200 |
| Subject | [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure |
| Message-ID | <qhc5Q-2yA-3@gated-at.bofh.it> |
During probe if the regulator could not be enabled, the error exit path
would still disable it. This could lead to unbalanced counter of
regulator enable/disable.
The patch moves code for getting and enabling the regulator from
exynos_map_dt_data() to probe function because it is really not a part
of getting Device Tree properties.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Fixes: 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure")
Cc: <stable@vger.kernel.org>
---
drivers/thermal/samsung/exynos_tmu.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 0bae8cc6c23a..23f4320f8ef7 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev)
struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata;
struct resource res;
- int ret;
if (!data || !pdev->dev.of_node)
return -ENODEV;
- /*
- * Try enabling the regulator if found
- * TODO: Add regulator as an SOC feature, so that regulator enable
- * is a compulsory call.
- */
- data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
- if (!IS_ERR(data->regulator)) {
- ret = regulator_enable(data->regulator);
- if (ret) {
- dev_err(&pdev->dev, "failed to enable vtmu\n");
- return ret;
- }
- } else {
- dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
- }
-
data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
if (data->id < 0)
data->id = 0;
@@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
pr_err("thermal: tz: %p ERROR\n", data->tzd);
return PTR_ERR(data->tzd);
}
+
+ /*
+ * Try enabling the regulator if found
+ * TODO: Add regulator as an SOC feature, so that regulator enable
+ * is a compulsory call.
+ */
+ data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
+ if (!IS_ERR(data->regulator)) {
+ ret = regulator_enable(data->regulator);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to enable vtmu\n");
+ return ret;
+ }
+ } else {
+ dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
+ }
+
ret = exynos_map_dt_data(pdev);
if (ret)
goto err_sensor;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| Date | 2015-10-08 07:40 +0200 |
| Subject | [PATCH 5/5] thermal: exynos: Directly return 0 instead of using local ret variable |
| Message-ID | <qhc5R-2yA-11@gated-at.bofh.it> |
| In reply to | #1241970 |
The 'ret' variable in exynos5440_tmu_initialize() is initialized to 0
and returned as is. Replace it with direct return statement. This also
fixes coccinelle warning:
drivers/thermal/samsung/exynos_tmu.c:611:5-8: Unneeded variable: "ret". Return "0" on line 654
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 1af7ea8dda71..f340e6edcb49 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -608,7 +608,7 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
{
struct exynos_tmu_data *data = platform_get_drvdata(pdev);
unsigned int trim_info = 0, con, rising_threshold;
- int ret = 0, threshold_code;
+ int threshold_code;
int crit_temp = 0;
/*
@@ -651,7 +651,8 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
/* Clear the PMIN in the common TMU register */
if (!data->id)
writel(0, data->base_second + EXYNOS5440_TMU_PMIN);
- return ret;
+
+ return 0;
}
static int exynos7_tmu_initialize(struct platform_device *pdev)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Alim Akhtar <alim.akhtar@gmail.com> |
|---|---|
| Date | 2015-10-08 18:50 +0200 |
| Subject | Re: [PATCH 5/5] thermal: exynos: Directly return 0 instead of using local ret variable |
| Message-ID | <qhmye-Jk-19@gated-at.bofh.it> |
| In reply to | #1241971 |
Hello,
On Thu, Oct 8, 2015 at 11:04 AM, Krzysztof Kozlowski
<k.kozlowski@samsung.com> wrote:
> The 'ret' variable in exynos5440_tmu_initialize() is initialized to 0
> and returned as is. Replace it with direct return statement. This also
> fixes coccinelle warning:
> drivers/thermal/samsung/exynos_tmu.c:611:5-8: Unneeded variable: "ret". Return "0" on line 654
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> drivers/thermal/samsung/exynos_tmu.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
> index 1af7ea8dda71..f340e6edcb49 100644
> --- a/drivers/thermal/samsung/exynos_tmu.c
> +++ b/drivers/thermal/samsung/exynos_tmu.c
> @@ -608,7 +608,7 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
> {
> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
> unsigned int trim_info = 0, con, rising_threshold;
> - int ret = 0, threshold_code;
> + int threshold_code;
> int crit_temp = 0;
>
> /*
> @@ -651,7 +651,8 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
> /* Clear the PMIN in the common TMU register */
> if (!data->id)
> writel(0, data->base_second + EXYNOS5440_TMU_PMIN);
> - return ret;
> +
> + return 0;
> }
>
> static int exynos7_tmu_initialize(struct platform_device *pdev)
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Regards,
Alim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Alim Akhtar <alim.akhtar@gmail.com> |
|---|---|
| Date | 2015-10-08 18:50 +0200 |
| Subject | Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure |
| Message-ID | <qhmyd-Jk-15@gated-at.bofh.it> |
| In reply to | #1241970 |
Hello,
On Thu, Oct 8, 2015 at 11:04 AM, Krzysztof Kozlowski
<k.kozlowski@samsung.com> wrote:
> During probe if the regulator could not be enabled, the error exit path
> would still disable it. This could lead to unbalanced counter of
> regulator enable/disable.
>
Do you see a regulator unbalanced reported here during boot? You may
want to add that to commit message.
> The patch moves code for getting and enabling the regulator from
> exynos_map_dt_data() to probe function because it is really not a part
> of getting Device Tree properties.
>
> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> Fixes: 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure")
> Cc: <stable@vger.kernel.org>
> ---
> drivers/thermal/samsung/exynos_tmu.c | 34 +++++++++++++++++-----------------
> 1 file changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
> index 0bae8cc6c23a..23f4320f8ef7 100644
> --- a/drivers/thermal/samsung/exynos_tmu.c
> +++ b/drivers/thermal/samsung/exynos_tmu.c
> @@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev)
> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
> struct exynos_tmu_platform_data *pdata;
> struct resource res;
> - int ret;
>
> if (!data || !pdev->dev.of_node)
> return -ENODEV;
>
> - /*
> - * Try enabling the regulator if found
> - * TODO: Add regulator as an SOC feature, so that regulator enable
> - * is a compulsory call.
> - */
> - data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
> - if (!IS_ERR(data->regulator)) {
> - ret = regulator_enable(data->regulator);
> - if (ret) {
> - dev_err(&pdev->dev, "failed to enable vtmu\n");
> - return ret;
> - }
> - } else {
> - dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
> - }
> -
> data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
> if (data->id < 0)
> data->id = 0;
> @@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
> pr_err("thermal: tz: %p ERROR\n", data->tzd);
> return PTR_ERR(data->tzd);
> }
> +
> + /*
> + * Try enabling the regulator if found
> + * TODO: Add regulator as an SOC feature, so that regulator enable
> + * is a compulsory call.
> + */
> + data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
> + if (!IS_ERR(data->regulator)) {
> + ret = regulator_enable(data->regulator);
> + if (ret) {
> + dev_err(&pdev->dev, "failed to enable vtmu\n");
> + return ret;
> + }
> + } else {
> + dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
> + }
> +
> ret = exynos_map_dt_data(pdev);
> if (ret)
> goto err_sensor;
> --
> 1.9.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Regards,
Alim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Krzysztof Kozlowski <k.kozlowski@samsung.com> |
|---|---|
| Date | 2015-10-09 13:00 +0200 |
| Subject | Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure |
| Message-ID | <qhDz3-8iV-5@gated-at.bofh.it> |
| In reply to | #1242598 |
W dniu 09.10.2015 o 01:45, Alim Akhtar pisze:
> Hello,
>
> On Thu, Oct 8, 2015 at 11:04 AM, Krzysztof Kozlowski
> <k.kozlowski@samsung.com> wrote:
>> During probe if the regulator could not be enabled, the error exit path
>> would still disable it. This could lead to unbalanced counter of
>> regulator enable/disable.
>>
> Do you see a regulator unbalanced reported here during boot? You may
> want to add that to commit message.
I did not see the warning/error message about unbalanced disable. It
would happen in certain condition only - no other enables of regulator
and count going below 0.
I would have to simulate this error to get the warning message. I don't
think it is worth the effort.
Best regards,
Krzysztof
>
>> The patch moves code for getting and enabling the regulator from
>> exynos_map_dt_data() to probe function because it is really not a part
>> of getting Device Tree properties.
>>
>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> Fixes: 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure")
>> Cc: <stable@vger.kernel.org>
>> ---
>> drivers/thermal/samsung/exynos_tmu.c | 34 +++++++++++++++++-----------------
>> 1 file changed, 17 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
>> index 0bae8cc6c23a..23f4320f8ef7 100644
>> --- a/drivers/thermal/samsung/exynos_tmu.c
>> +++ b/drivers/thermal/samsung/exynos_tmu.c
>> @@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev)
>> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
>> struct exynos_tmu_platform_data *pdata;
>> struct resource res;
>> - int ret;
>>
>> if (!data || !pdev->dev.of_node)
>> return -ENODEV;
>>
>> - /*
>> - * Try enabling the regulator if found
>> - * TODO: Add regulator as an SOC feature, so that regulator enable
>> - * is a compulsory call.
>> - */
>> - data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
>> - if (!IS_ERR(data->regulator)) {
>> - ret = regulator_enable(data->regulator);
>> - if (ret) {
>> - dev_err(&pdev->dev, "failed to enable vtmu\n");
>> - return ret;
>> - }
>> - } else {
>> - dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
>> - }
>> -
>> data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
>> if (data->id < 0)
>> data->id = 0;
>> @@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
>> pr_err("thermal: tz: %p ERROR\n", data->tzd);
>> return PTR_ERR(data->tzd);
>> }
>> +
>> + /*
>> + * Try enabling the regulator if found
>> + * TODO: Add regulator as an SOC feature, so that regulator enable
>> + * is a compulsory call.
>> + */
>> + data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
>> + if (!IS_ERR(data->regulator)) {
>> + ret = regulator_enable(data->regulator);
>> + if (ret) {
>> + dev_err(&pdev->dev, "failed to enable vtmu\n");
>> + return ret;
>> + }
>> + } else {
>> + dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
>> + }
>> +
>> ret = exynos_map_dt_data(pdev);
>> if (ret)
>> goto err_sensor;
>> --
>> 1.9.1
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Alim Akhtar <alim.akhtar@gmail.com> |
|---|---|
| Date | 2015-10-10 03:50 +0200 |
| Subject | Re: [PATCH 1/5] thermal: exynos: Fix unbalanced regulator disable on probe failure |
| Message-ID | <qhRsm-309-5@gated-at.bofh.it> |
| In reply to | #1243240 |
Hello,
On Fri, Oct 9, 2015 at 4:28 PM, Krzysztof Kozlowski
<k.kozlowski@samsung.com> wrote:
> W dniu 09.10.2015 o 01:45, Alim Akhtar pisze:
>> Hello,
>>
>> On Thu, Oct 8, 2015 at 11:04 AM, Krzysztof Kozlowski
>> <k.kozlowski@samsung.com> wrote:
>>> During probe if the regulator could not be enabled, the error exit path
>>> would still disable it. This could lead to unbalanced counter of
>>> regulator enable/disable.
>>>
>> Do you see a regulator unbalanced reported here during boot? You may
>> want to add that to commit message.
>
> I did not see the warning/error message about unbalanced disable. It
> would happen in certain condition only - no other enables of regulator
> and count going below 0.
>
> I would have to simulate this error to get the warning message. I don't
> think it is worth the effort.
>
Ok, looking at code, it does looks to be calling regulator disable in
case regulator enable fails.
Feel free to add
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Thanks!!
> Best regards,
> Krzysztof
>
>>
>>> The patch moves code for getting and enabling the regulator from
>>> exynos_map_dt_data() to probe function because it is really not a part
>>> of getting Device Tree properties.
>>>
>>> Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>> Fixes: 5f09a5cbd14a ("thermal: exynos: Disable the regulator on probe failure")
>>> Cc: <stable@vger.kernel.org>
>>> ---
>>> drivers/thermal/samsung/exynos_tmu.c | 34 +++++++++++++++++-----------------
>>> 1 file changed, 17 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
>>> index 0bae8cc6c23a..23f4320f8ef7 100644
>>> --- a/drivers/thermal/samsung/exynos_tmu.c
>>> +++ b/drivers/thermal/samsung/exynos_tmu.c
>>> @@ -1168,27 +1168,10 @@ static int exynos_map_dt_data(struct platform_device *pdev)
>>> struct exynos_tmu_data *data = platform_get_drvdata(pdev);
>>> struct exynos_tmu_platform_data *pdata;
>>> struct resource res;
>>> - int ret;
>>>
>>> if (!data || !pdev->dev.of_node)
>>> return -ENODEV;
>>>
>>> - /*
>>> - * Try enabling the regulator if found
>>> - * TODO: Add regulator as an SOC feature, so that regulator enable
>>> - * is a compulsory call.
>>> - */
>>> - data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
>>> - if (!IS_ERR(data->regulator)) {
>>> - ret = regulator_enable(data->regulator);
>>> - if (ret) {
>>> - dev_err(&pdev->dev, "failed to enable vtmu\n");
>>> - return ret;
>>> - }
>>> - } else {
>>> - dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
>>> - }
>>> -
>>> data->id = of_alias_get_id(pdev->dev.of_node, "tmuctrl");
>>> if (data->id < 0)
>>> data->id = 0;
>>> @@ -1312,6 +1295,23 @@ static int exynos_tmu_probe(struct platform_device *pdev)
>>> pr_err("thermal: tz: %p ERROR\n", data->tzd);
>>> return PTR_ERR(data->tzd);
>>> }
>>> +
>>> + /*
>>> + * Try enabling the regulator if found
>>> + * TODO: Add regulator as an SOC feature, so that regulator enable
>>> + * is a compulsory call.
>>> + */
>>> + data->regulator = devm_regulator_get(&pdev->dev, "vtmu");
>>> + if (!IS_ERR(data->regulator)) {
>>> + ret = regulator_enable(data->regulator);
>>> + if (ret) {
>>> + dev_err(&pdev->dev, "failed to enable vtmu\n");
>>> + return ret;
>>> + }
>>> + } else {
>>> + dev_info(&pdev->dev, "Regulator node (vtmu) not found\n");
>>> + }
>>> +
>>> ret = exynos_map_dt_data(pdev);
>>> if (ret)
>>> goto err_sensor;
>>> --
>>> 1.9.1
>>>
>>>
>>> _______________________________________________
>>> linux-arm-kernel mailing list
>>> linux-arm-kernel@lists.infradead.org
>>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>
>>
>>
>
--
Regards,
Alim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web