thermal: qcom: tsens: init debugfs only with successful probe
Subsystems (3)
PATCH RESEND 1/2 thermal: qcom: tsens: init debugfs only with successful probe
calibrate and tsens_register can fail or PROBE_DEFER. This will cause a double or a wrong init of the debugfs information. Init debugfs only with successful probe fixing warning about directory already present.
--- drivers/thermal/qcom/tsens.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/thermal/qcom/tsens.c +6 -3
@@ -918,8 +918,6 @@ int __init init_common(struct tsens_priv *priv)if (tsens_version (priv) >=VER_0_1 )tsens_enable_irq (priv); -tsens_debug_init (op); - err_put_device:put_device (&op->dev);return ret;
@@ -1153,7 +1151,12 @@ static int tsens_probe(struct platform_device *pdev) } } -return tsens_register (priv); + ret =tsens_register (priv); + +if (!ret) +tsens_debug_init (pdev); + +return ret; }static int tsens_remove (struct platform_device *pdev)
Signature · 1 line
2.37.2
PATCH RESEND 2/2 thermal: qcom: tsens: simplify debugfs init function
Simplify debugfs init function.
- Add check for existing dev directory.
- Fix wrong version in dbg_version_show (with version 0.0.0, 0.1.0 was incorrectly reported)
--- drivers/thermal/qcom/tsens.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/thermal/qcom/tsens.c +5 -9
@@ -692,7 +692,7 @@ static int dbg_version_show(struct seq_file *s, void *data)return ret;seq_printf (s,"%d.%d.%d\n" , maj_ver, min_ver, step_ver); }else { -seq_puts (s,"0.1.0\n" ); +seq_printf (s,"0.%d.0\n" , priv->feat->ver_major); }return 0 ;
@@ -704,21 +704,17 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);static void tsens_debug_init (struct platform_device *pdev) {struct tsens_priv *priv =platform_get_drvdata (pdev); -struct dentry *root, *file; - root =debugfs_lookup ("tsens" ,NULL ); -if (!root) + priv->debug_root =debugfs_lookup ("tsens" ,NULL ); +if (!priv->debug_root) priv->debug_root =debugfs_create_dir ("tsens" ,NULL ); -else - priv->debug_root = root; - file =debugfs_lookup ("version" , priv->debug_root); -if (!file) +if (!debugfs_lookup ("version" , priv->debug_root))debugfs_create_file ("version" ,0444 , priv->debug_root, pdev, &dbg_version_fops);/* A directory for each instance of the TSENS IP */ - priv->debug =debugfs_create_dir (dev_name (&pdev->dev), priv->debug_root); + priv->debug =debugfs_lookup (dev_name (&pdev->dev), priv->debug_root);debugfs_create_file ("sensors" ,0444 , priv->debug, pdev, &dbg_sensors_fops); }#else
Signature · 1 line
2.37.2
Re: [RESEND PATCH 2/2] thermal: qcom: tsens: simplify debugfs init function
Quoted 37 lines · Christian Marangi
Simplify debugfs init function.
- Add check for existing dev directory.
- Fix wrong version indbg_version_show(with version 0.0.0, 0.1.0 was incorrectly reported)Signed-off-by Christian Marangi <[email protected]>Reviewed-by Thara Gopinath <[email protected]>--- drivers/thermal/qcom/tsens.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)drivers/thermal/qcom/tsens.c +3
-6@@ -692,7 +692,7 @@ static int dbg_version_show(struct seq_file *s, void *data)return ret;seq_printf (s,"%d.%d.%d\n" , maj_ver, min_ver, step_ver); }else { -seq_puts (s,"0.1.0\n" ); +seq_printf (s,"0.%d.0\n" , priv->feat->ver_major); }return 0 ;@@ -704,21 +704,17 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);static void tsens_debug_init (struct platform_device *pdev) {struct tsens_priv *priv =platform_get_drvdata (pdev); -struct dentry *root, *file; - root =debugfs_lookup ("tsens" ,NULL ); -if (!root) + priv->debug_root =debugfs_lookup ("tsens" ,NULL ); +if (!priv->debug_root) priv->debug_root =debugfs_create_dir ("tsens" ,NULL ); -else - priv->debug_root = root;
drivers/thermal/qcom/tsens.c DEFINE_SHOW_ATTRIBUTE(dbg_sensors); · line 717
Quoted 10 lines
drivers/thermal/qcom/tsens.c +2
-3- file =debugfs_lookup ("version" , priv->debug_root); -if (!file) +if (!debugfs_lookup ("version" , priv->debug_root))debugfs_create_file ("version" ,0444 , priv->debug_root, pdev, &dbg_version_fops);/* A directory for each instance of the TSENS IP */ - priv->debug =debugfs_create_dir (dev_name (&pdev->dev), priv->debug_root); + priv->debug =debugfs_lookup (dev_name (&pdev->dev), priv->debug_root);
Why the directory creation is replaced by the lookup ?
Quoted 3 lines
drivers/thermal/qcom/tsens.c +0
-0debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops); }#else
Signature · 5 lines
<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: [RESEND PATCH 2/2] thermal: qcom: tsens: simplify debugfs init function
Quoted 38 lines · Daniel Lezcano
Quoted 37 lines · Christian Marangi
Simplify debugfs init function.
- Add check for existing dev directory.
- Fix wrong version indbg_version_show(with version 0.0.0, 0.1.0 was incorrectly reported)Signed-off-by Christian Marangi <[email protected]>Reviewed-by Thara Gopinath <[email protected]>--- drivers/thermal/qcom/tsens.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)drivers/thermal/qcom/tsens.c +3
-8@@ -692,7 +692,7 @@ static int dbg_version_show(struct seq_file *s, void *data)return ret;seq_printf (s,"%d.%d.%d\n" , maj_ver, min_ver, step_ver); }else { -seq_puts (s,"0.1.0\n" ); +seq_printf (s,"0.%d.0\n" , priv->feat->ver_major); }return 0 ;@@ -704,21 +704,17 @@ DEFINE_SHOW_ATTRIBUTE(dbg_sensors);static void tsens_debug_init (struct platform_device *pdev) {struct tsens_priv *priv =platform_get_drvdata (pdev); -struct dentry *root, *file; - root =debugfs_lookup ("tsens" ,NULL ); -if (!root) + priv->debug_root =debugfs_lookup ("tsens" ,NULL ); +if (!priv->debug_root) priv->debug_root =debugfs_create_dir ("tsens" ,NULL ); -else - priv->debug_root = root; - file =debugfs_lookup ("version" , priv->debug_root); -if (!file)
Quoted 9 lines
drivers/thermal/qcom/tsens.c DEFINE_SHOW_ATTRIBUTE(dbg_sensors); · line 717
Quoted 6 lines
drivers/thermal/qcom/tsens.c +2
-1+if (!debugfs_lookup ("version" , priv->debug_root))debugfs_create_file ("version" ,0444 , priv->debug_root, pdev, &dbg_version_fops);/* A directory for each instance of the TSENS IP */ - priv->debug =debugfs_create_dir (dev_name (&pdev->dev), priv->debug_root); + priv->debug =debugfs_lookup (dev_name (&pdev->dev), priv->debug_root);Why the directory creation is replaced by the lookup ?
Hi,
thanks for the review! I have to be honest and do not create some fake excuse for this. This patch is a bit old and was pending from a long time so out of despair i just tried to RESEND this hoping someone would pick it up. And it seems it have worked... Sooo sorry for making you asking this.
On rechecking the change here, the entire debug_init logic seems wrong... I don't know if it's possible but what if in the system there are multiple version of tsens istance? Looks wrong to overwrite the version with the last one...
I think the original idea of this was to create a directory for each istance and put in there version and sensors debugfs.
I will propose this in the next version if it's ok for you and you agree with this logic. Also I think I will split this in 2 different patch one for the version fixup and one for this new logic.
Waiting for your feedback and again sorry for the noise.
Quoted 11 lines
Quoted 3 lines
drivers/thermal/qcom/tsens.c +0
-0debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops); }#else Signature · 5 lines
<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
Signature · 1 line
Ansuel
Re: [RESEND PATCH 2/2] thermal: qcom: tsens: simplify debugfs init function
On 21/10/2022 20:56, Christian Marangi wrote:
[ ... ]
Quoted 11 lines
Hi,
thanks for the review! I have to be honest and do not create some fake excuse for this. This patch is a bit old and was pending from a long time so out of despair i just tried to RESEND this hoping someone would pick it up. And it seems it have worked... Sooo sorry for making you asking this.On rechecking the change here, the entire
debug_initlogic seems wrong... I don't know if it's possible but what if in the system there are multiple version of tsens istance? Looks wrong to overwrite the version with the last one...
It sounds not logical to have different versions, a quick look at the DT seems to confirm this. However, it is an assumption and it may be safer to assume the opposite can happen
Quoted 6 lines
I think the original idea of this was to create a directory for each istance and put in there version and sensors debugfs.
I will propose this in the next version if it's ok for you and you agree with this logic. Also I think I will split this in 2 different patch one for the version fixup and one for this new logic.
I don't have a strong opinion on that but it seems reasonable
Quoted 1 line
Waiting for your feedback and again sorry for the noise.
No worries ;)
Quoted 12 lines
Quoted 11 lines
Quoted 3 lines
debugfs_create_file("sensors", 0444, priv->debug, pdev, &dbg_sensors_fops); } #elseSignature · 5 lines
<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
Signature · 5 lines
<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
Quoted 24 lines · Christian Marangi
calibrate and
tsens_registercan fail orPROBE_DEFER. This will cause a double or a wrong init of the debugfs information. Init debugfs only with successful probe fixing warning about directory already present.Signed-off-by Christian Marangi <[email protected]>Acked-by Thara Gopinath <[email protected]>--- drivers/thermal/qcom/tsens.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/thermal/qcom/tsens.c +0
-2@@ -918,8 +918,6 @@ int __init init_common(struct tsens_priv *priv)if (tsens_version (priv) >=VER_0_1 )tsens_enable_irq (priv); -tsens_debug_init (op); - err_put_device:put_device (&op->dev);return ret;
drivers/thermal/qcom/tsens.c static int tsens_probe(struct platform_device *pdev) · line 1155
Quoted 6 lines
drivers/thermal/qcom/tsens.c +2
-1@@ -1153,7 +1151,12 @@ static int tsens_probe(struct platform_device *pdev) } } -return tsens_register (priv); + ret =tsens_register (priv); +
extra line
Quoted 7 lines
drivers/thermal/qcom/tsens.c +4
-0+if (!ret) +tsens_debug_init (pdev); + +return ret; }static int tsens_remove (struct platform_device *pdev)
Signature · 5 lines
<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