lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 10 Jun 2012 04:15:25 +0000 From: "Tc, Jenny" <jenny.tc@...el.com> To: "cbouatmailru@...il.com" <cbouatmailru@...il.com>, "anton.vorontsov@...aro.org" <anton.vorontsov@...aro.org> CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>, "R, Durgadoss" <durgadoss.r@...el.com> Subject: RE: [PATCHv2] power_supply: Register battery as a thermal zone Hi Anton, Ping.. Could you please review/merge this patch ? Thanks, -jtc > -----Original Message----- > From: Tc, Jenny > Sent: Wednesday, May 09, 2012 8:37 PM > To: cbouatmailru@...il.com; anton.vorontsov@...aro.org > Cc: linux-kernel@...r.kernel.org; R, Durgadoss; Tc, Jenny > Subject: [PATCHv2] power_supply: Register battery as a thermal zone > > Battery and charger contribute to Thermals in most of the embedded > devices. So, it makes sense to identify them as Thermal zones in a particular > platform. > > This patch registers a thermal zone if the power supply is reporting a > temperature property. The thermal zone will be used by platform's thermal > management solution. > > Signed-off-by: Jenny TC <jenny.tc@...el.com> > --- > v1 > * Made initial code changes > v2 > * Removed unnecessary WARN_ON's > * Consolidated all #ifdef CONFIG_THERMAL in one place > drivers/power/power_supply_core.c | 59 > +++++++++++++++++++++++++++++++++++++ > include/linux/power_supply.h | 3 ++ > 2 files changed, 62 insertions(+), 0 deletions(-) > > diff --git a/drivers/power/power_supply_core.c > b/drivers/power/power_supply_core.c > index 6ad6127..8e01432 100644 > --- a/drivers/power/power_supply_core.c > +++ b/drivers/power/power_supply_core.c > @@ -17,6 +17,7 @@ > #include <linux/device.h> > #include <linux/err.h> > #include <linux/power_supply.h> > +#include <linux/thermal.h> > #include "power_supply.h" > > /* exported for the APM Power driver, APM emulation */ @@ -169,6 > +170,53 @@ static void power_supply_dev_release(struct device *dev) > kfree(dev); > } > > +#ifdef CONFIG_THERMAL > +static int power_supply_read_temp(struct thermal_zone_device *tzd, > + unsigned long *temp) > +{ > + struct power_supply *psy; > + union power_supply_propval val; > + int ret; > + > + WARN_ON(tzd == NULL); > + psy = tzd->devdata; > + ret = psy->get_property(psy, > + POWER_SUPPLY_PROP_TEMP, &val); > + > + /* Convert tenths of degree Celsius to milli degree Celsius*/ > + if (!ret) > + *temp = val.intval * 100; > + > + return ret; > +} > + > +static struct thermal_zone_device_ops psy_tzd_ops = { > + .get_temp = power_supply_read_temp, > +}; > + > +static int register_thermal(struct power_supply *psy) { > + int i; > + /* Register battery zone device psy reports temperature */ > + for (i = 0; i < psy->num_properties; i++) { > + if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { > + psy->tzd = thermal_zone_device_register( > + (char *)psy->name, 0, psy, > + &psy_tzd_ops, 0, 0, 0, 0); > + if (IS_ERR(psy->tzd)) > + return PTR_ERR(psy->tzd); > + break; > + } > + } > + return 0; > +} > +#else > +static int register_thermal(struct power_supply *psy) { > + return 0; > +} > +#endif > + > int power_supply_register(struct device *parent, struct power_supply *psy) > { > struct device *dev; > @@ -197,6 +245,10 @@ int power_supply_register(struct device *parent, > struct power_supply *psy) > if (rc) > goto device_add_failed; > > + rc = register_thermal(psy); > + if (rc) > + goto therm_zone_reg_failed; > + > rc = power_supply_create_triggers(psy); > if (rc) > goto create_triggers_failed; > @@ -206,6 +258,9 @@ int power_supply_register(struct device *parent, > struct power_supply *psy) > goto success; > > create_triggers_failed: > + if (psy->tzd) > + thermal_zone_device_unregister(psy->tzd); > +therm_zone_reg_failed: > device_del(dev); > kobject_set_name_failed: > device_add_failed: > @@ -220,6 +275,10 @@ void power_supply_unregister(struct power_supply > *psy) > cancel_work_sync(&psy->changed_work); > sysfs_remove_link(&psy->dev->kobj, "powers"); > power_supply_remove_triggers(psy); > +#ifdef CONFIG_THERMAL > + if (psy->tzd) > + thermal_zone_device_unregister(psy->tzd); > +#endif > device_unregister(psy->dev); > } > EXPORT_SYMBOL_GPL(power_supply_unregister); > diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h > index c38c13d..1f58435 100644 > --- a/include/linux/power_supply.h > +++ b/include/linux/power_supply.h > @@ -172,6 +172,9 @@ struct power_supply { > /* private */ > struct device *dev; > struct work_struct changed_work; > +#ifdef CONFIG_THERMAL > + struct thermal_zone_device *tzd; > +#endif > > #ifdef CONFIG_LEDS_TRIGGERS > struct led_trigger *charging_full_trig; > -- > 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists