Fixes for Tegra soctherm
Subsystems (2)
v5 cover Fixes for Tegra soctherm
This series fixed some issues for Tegra soctherm
Main changes from v4:
1. fixed for the parsing sensor id.
2. keep warning for missing critical trips.
Main changes from v3:
1. updated codes for parsing sensor id, per Thierry's comments
Main changes from v2:
1. add codes to parse sensor id to avoid registration failure.
Main changes from v1:
1. Acked by Thierry Reding <[email protected]> for the patch "thermal: tegra: fix memory allocation".
2. Print out the sensor name when register failed.
2. Remove patch "thermal: tegra: fix coverity defect"
Wei Ni (3):
thermal: tegra: remove unnecessary warnings
thermal: tegra: fix memory allocation
thermal: tegra: parse sensor id before sensor register
drivers/thermal/tegra/soctherm.c | 51 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-)
Signature · 1 line
2.7.4
PATCH v5 1/3 thermal: tegra: remove unnecessary warnings
Convert warnings to info as not all platforms may
have all the thresholds and sensors enabled.
--- drivers/thermal/tegra/soctherm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/thermal/tegra/soctherm.c +2 -2
@@ -569,7 +569,7 @@ static int tegra_soctherm_set_hwtrips(struct device *dev, set_throttle: ret =get_hot_temp (tz, &trip, &temperature);if (ret) { -dev_warn (dev,"throttrip: %s: missing hot temperature\n" , +dev_info (dev,"throttrip: %s: missing hot temperature\n" , sg->name);return 0 ; }
@@ -600,7 +600,7 @@ static int tegra_soctherm_set_hwtrips(struct device *dev, }if (i ==THROTTLE_SIZE ) -dev_warn (dev,"throttrip: %s: missing throttle cdev\n" , +dev_info (dev,"throttrip: %s: missing throttle cdev\n" , sg->name);return 0 ;
Signature · 1 line
2.7.4
PATCH v5 2/3 thermal: tegra: fix memory allocation
In reply to Wei NiFix memory allocation to store the pointers tothermal_zone_device.
--- drivers/thermal/tegra/soctherm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/tegra/soctherm.c +1 -1
@@ -1339,7 +1339,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev) } tegra->thermctl_tzs =devm_kcalloc (&pdev->dev, - soc->num_ttgs,sizeof (*z), + soc->num_ttgs,sizeof (z),GFP_KERNEL );if (!tegra->thermctl_tzs)return -ENOMEM ;
Signature · 1 line
2.7.4
PATCH v5 3/3 thermal: tegra: parse sensor id before sensor register
In reply to Wei NiSince different platforms may not support all 4 sensors, so the sensor registration may be failed. Add codes to parse dt to find sensor id which need to be registered. So that the registration can be successful on all platform.
--- drivers/thermal/tegra/soctherm.c | 45 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-)
drivers/thermal/tegra/soctherm.c +43 -2
@@ -1224,6 +1224,41 @@ static void soctherm_init(struct platform_device *pdev)tegra_soctherm_throttle (&pdev->dev); } +static bool tegra_soctherm_find_sensor_id (unsigned int sensor_id) +{ +bool ret = false; +struct of_phandle_args sensor_specs; +struct device_node *np, *sensor_np; + + np =of_find_node_by_name (NULL ,"thermal-zones" ); +if (!np) +return ret; + +for_each_available_child_of_node (np, sensor_np) { +if (of_parse_phandle_with_args (sensor_np,"thermal-sensors" , +"#thermal-sensor-cells" , +0 , &sensor_specs)) +continue ; + +if (sensor_specs.args_count !=1 ) { +WARN (sensor_specs.args_count !=1 , +"%s: wrong cells in sensor specifier %d\n" , + sensor_specs.np->name, sensor_specs.args_count); +continue ; + } + +if (sensor_specs.args[0 ] == sensor_id) { + ret = true; +break ; + } + } + +of_node_put (np); +of_node_put (sensor_np); + +return ret; +} + static const struct of_device_id tegra_soctherm_of_match[] = { #ifdef CONFIG_ARCH_TEGRA_124_SOC {
@@ -1365,13 +1400,16 @@ static int tegra_soctherm_probe(struct platform_device *pdev) zone->sg = soc->ttgs[i]; zone->ts = tegra; +if (!tegra_soctherm_find_sensor_id (soc->ttgs[i]->id)) +continue ; + z =devm_thermal_zone_of_sensor_register (&pdev->dev, soc->ttgs[i]->id, zone, &tegra_of_thermal_ops);if (IS_ERR (z)) { err =PTR_ERR (z); -dev_err (&pdev->dev,"failed to register sensor: %d\n" , - err); +dev_err (&pdev->dev,"failed to register sensor %s: %d\n" , + soc->ttgs[i]->name, err); goto disable_clocks; }
@@ -1434,6 +1472,9 @@ static int __maybe_unused soctherm_resume(struct device *dev)struct thermal_zone_device *tz; tz = tegra->thermctl_tzs[soc->ttgs[i]->id]; +if (!tz) +continue ; + err =tegra_soctherm_set_hwtrips (dev, soc->ttgs[i], tz);if (err) { dev_err(&pdev->dev,
Signature · 1 line
2.7.4
Hi,
Does there have any comments on this serial?
Thanks.
Wei.
Quoted 27 lines · Wei Ni
This series fixed some issues for Tegra soctherm
Main changes from v4:
1. fixed for the parsing sensor id.
2. keep warning for missing critical trips.Main changes from v3:
1. updated codes for parsing sensor id, per Thierry's commentsMain changes from v2:
1. add codes to parse sensor id to avoid registration failure.Main changes from v1:
1. Acked by Thierry Reding <[email protected]> for the patch "thermal: tegra: fix memory allocation".
2. Print out the sensor name when register failed.
2. Remove patch "thermal: tegra: fix coverity defect"Wei Ni (3):
thermal: tegra: remove unnecessary warnings
thermal: tegra: fix memory allocation
thermal: tegra: parse sensor id before sensor registerdrivers/thermal/tegra/soctherm.c | 51 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-)
Hi Rui & Eduardo,
It looks no more comments on this version, could you please take this serial?
Thanks.
Wei.
Quoted 34 lines · Wei Ni
Hi,
Does there have any comments on this serial?Thanks.
Wei.Quoted 27 lines · Wei Ni
This series fixed some issues for Tegra soctherm
Main changes from v4:
1. fixed for the parsing sensor id.
2. keep warning for missing critical trips.Main changes from v3:
1. updated codes for parsing sensor id, per Thierry's commentsMain changes from v2:
1. add codes to parse sensor id to avoid registration failure.Main changes from v1:
1. Acked by Thierry Reding <[email protected]> for the patch "thermal: tegra: fix memory allocation".
2. Print out the sensor name when register failed.
2. Remove patch "thermal: tegra: fix coverity defect"Wei Ni (3):
thermal: tegra: remove unnecessary warnings
thermal: tegra: fix memory allocation
thermal: tegra: parse sensor id before sensor registerdrivers/thermal/tegra/soctherm.c | 51 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 5 deletions(-)