Registering the cooling device from the probe can result in the
execution of get_property() function before it gets initialized.
To avoid this, register the cooling device from a workqueue
instead of registering in the probe.
Signed-off-by: Manaf Meethalavalappu Pallikunhi <[email protected]>
---
drivers/power/supply/power_supply_core.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 668369b..ef6f290 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -132,6 +132,7 @@ void power_supply_changed(struct power_supply *psy)
}
EXPORT_SYMBOL_GPL(power_supply_changed);
+static int psy_register_cooler(struct power_supply *psy);
/*
* Notify that power supply was registered after parent finished the probing.
*
@@ -139,6 +140,8 @@ EXPORT_SYMBOL_GPL(power_supply_changed);
* calling power_supply_changed() directly from power_supply_register()
* would lead to execution of get_property() function provided by the driver
* too early - before the probe ends.
+ * Also, registering cooling device from the probe will execute the
+ * get_property() function. So register the cooling device after the probe.
*
* Avoid that by waiting on parent's mutex.
*/
@@ -156,6 +159,7 @@ static void power_supply_deferred_register_work(struct work_struct *work)
}
power_supply_changed(psy);
+ psy_register_cooler(psy);
if (psy->dev.parent)
mutex_unlock(&psy->dev.parent->mutex);
@@ -1238,10 +1242,6 @@ __power_supply_register(struct device *parent,
if (rc)
goto register_thermal_failed;
- rc = psy_register_cooler(psy);
- if (rc)
- goto register_cooler_failed;
-
rc = power_supply_create_triggers(psy);
if (rc)
goto create_triggers_failed;
@@ -1271,8 +1271,6 @@ __power_supply_register(struct device *parent,
add_hwmon_sysfs_failed:
power_supply_remove_triggers(psy);
create_triggers_failed:
- psy_unregister_cooler(psy);
-register_cooler_failed:
psy_unregister_thermal(psy);
register_thermal_failed:
device_del(dev);
With thermal frameworks of-thermal interface, thermal zone parameters can
be defined in devicetree. This includes cooling device mitigation levels
for a thermal zone. To take advantage of this, cooling device should use
the thermal_of_cooling_device_register API to register a cooling device.
Use thermal_of_cooling_device_register API to register the power supply
cooling device. This enables power supply cooling device be included in the
thermal zone parameter in devicetree.
Signed-off-by: Manaf Meethalavalappu Pallikunhi <[email protected]>
---
drivers/power/supply/power_supply_core.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index ef6f290..f42031c 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -1134,9 +1134,15 @@ static int psy_register_cooler(struct power_supply *psy)
for (i = 0; i < psy->desc->num_properties; i++) {
if (psy->desc->properties[i] ==
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT) {
- psy->tcd = thermal_cooling_device_register(
- (char *)psy->desc->name,
- psy, &psy_tcd_ops);
+ if (psy->dev.parent)
+ psy->tcd = thermal_of_cooling_device_register(
+ dev_of_node(psy->dev.parent),
+ (char *)psy->desc->name,
+ psy, &psy_tcd_ops);
+ else
+ psy->tcd = thermal_cooling_device_register(
+ (char *)psy->desc->name,
+ psy, &psy_tcd_ops);
return PTR_ERR_OR_ZERO(psy->tcd);
}
}
++
On 1/25/2022 1:04 AM, Manaf Meethalavalappu Pallikunhi wrote:
> Hi Sebastian Reichel,
>
> Just reminder for review for these patches
>
> Thanks,
>
> Manaf
>
> On 12/22/2021 2:11 PM, Manaf Meethalavalappu Pallikunhi wrote:
>> Registering the cooling device from the probe can result in the
>> execution of get_property() function before it gets initialized.
>>
>> To avoid this, register the cooling device from a workqueue
>> instead of registering in the probe.
>>
>> Signed-off-by: Manaf Meethalavalappu Pallikunhi
>> <[email protected]>
>> ---
>> drivers/power/supply/power_supply_core.c | 10 ++++------
>> 1 file changed, 4 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/power/supply/power_supply_core.c
>> b/drivers/power/supply/power_supply_core.c
>> index 668369b..ef6f290 100644
>> --- a/drivers/power/supply/power_supply_core.c
>> +++ b/drivers/power/supply/power_supply_core.c
>> @@ -132,6 +132,7 @@ void power_supply_changed(struct power_supply *psy)
>> }
>> EXPORT_SYMBOL_GPL(power_supply_changed);
>> +static int psy_register_cooler(struct power_supply *psy);
>> /*
>> * Notify that power supply was registered after parent finished
>> the probing.
>> *
>> @@ -139,6 +140,8 @@ EXPORT_SYMBOL_GPL(power_supply_changed);
>> * calling power_supply_changed() directly from
>> power_supply_register()
>> * would lead to execution of get_property() function provided by
>> the driver
>> * too early - before the probe ends.
>> + * Also, registering cooling device from the probe will execute the
>> + * get_property() function. So register the cooling device after the
>> probe.
>> *
>> * Avoid that by waiting on parent's mutex.
>> */
>> @@ -156,6 +159,7 @@ static void
>> power_supply_deferred_register_work(struct work_struct *work)
>> }
>> power_supply_changed(psy);
>> + psy_register_cooler(psy);
>> if (psy->dev.parent)
>> mutex_unlock(&psy->dev.parent->mutex);
>> @@ -1238,10 +1242,6 @@ __power_supply_register(struct device *parent,
>> if (rc)
>> goto register_thermal_failed;
>> - rc = psy_register_cooler(psy);
>> - if (rc)
>> - goto register_cooler_failed;
>> -
>> rc = power_supply_create_triggers(psy);
>> if (rc)
>> goto create_triggers_failed;
>> @@ -1271,8 +1271,6 @@ __power_supply_register(struct device *parent,
>> add_hwmon_sysfs_failed:
>> power_supply_remove_triggers(psy);
>> create_triggers_failed:
>> - psy_unregister_cooler(psy);
>> -register_cooler_failed:
>> psy_unregister_thermal(psy);
>> register_thermal_failed:
>> device_del(dev);
>>