mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
297d716f62
Change the ownership of power_supply structure from each driver implementing the class to the power supply core. The patch changes power_supply_register() function thus all drivers implementing power supply class are adjusted. Each driver provides the implementation of power supply. However it should not be the owner of power supply class instance because it is exposed by core to other subsystems with power_supply_get_by_name(). These other subsystems have no knowledge when the driver will unregister the power supply. This leads to several issues when driver is unbound - mostly because user of power supply accesses freed memory. Instead let the core own the instance of struct 'power_supply'. Other users of this power supply will still access valid memory because it will be freed when device reference count reaches 0. Currently this means "it will leak" but power_supply_put() call in next patches will solve it. This solves invalid memory references in following race condition scenario: Thread 1: charger manager Thread 2: power supply driver, used by charger manager THREAD 1 (charger manager) THREAD 2 (power supply driver) ========================== ============================== psy = power_supply_get_by_name() Driver unbind, .remove power_supply_unregister() Device fully removed psy->get_property() The 'get_property' call is executed in invalid context because the driver was unbound and struct 'power_supply' memory was freed. This could be observed easily with charger manager driver (here compiled with max17040 fuel gauge): $ cat /sys/devices/virtual/power_supply/cm-battery/capacity & $ echo "1-0036" > /sys/bus/i2c/drivers/max17040/unbind [ 55.725123] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 55.732584] pgd = d98d4000 [ 55.734060] [00000000] *pgd=5afa2831, *pte=00000000, *ppte=00000000 [ 55.740318] Internal error: Oops: 80000007 [#1] PREEMPT SMP ARM [ 55.746210] Modules linked in: [ 55.749259] CPU: 1 PID: 2936 Comm: cat Tainted: G W 3.19.0-rc1-next-20141226-00048-gf79f475f3c44-dirty #1496 [ 55.760190] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 55.766270] task: d9b76f00 ti: daf54000 task.ti: daf54000 [ 55.771647] PC is at 0x0 [ 55.774182] LR is at charger_get_property+0x2f4/0x36c [ 55.779201] pc : [<00000000>] lr : [<c034b0b4>] psr: 60000013 [ 55.779201] sp : daf55e90 ip : 00000003 fp : 00000000 [ 55.790657] r10: 00000000 r9 : c06e2878 r8 : d9b26c68 [ 55.795865] r7 : dad81610 r6 : daec7410 r5 : daf55ebc r4 : 00000000 [ 55.802367] r3 : 00000000 r2 : daf55ebc r1 : 0000002a r0 : d9b26c68 [ 55.808879] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user [ 55.815994] Control: 10c5387d Table: 598d406a DAC: 00000015 [ 55.821723] Process cat (pid: 2936, stack limit = 0xdaf54210) [ 55.827451] Stack: (0xdaf55e90 to 0xdaf56000) [ 55.831795] 5e80: 60000013 c01459c4 0000002a c06f8ef8 [ 55.839956] 5ea0: db651000 c06f8ef8 daebac00 c04cb668 daebac08 c0346864 00000000 c01459c4 [ 55.848115] 5ec0: d99eaa80 c06f8ef8 00000fff 00001000 db651000 c027f25c c027f240 d99eaa80 [ 55.856274] 5ee0: d9a06c00 c0146218 daf55f18 00001000 d99eaa80 db4c18c0 00000001 00000001 [ 55.864468] 5f00: daf55f80 c0144c78 c0144c54 c0107f90 00015000 d99eaab0 00000000 00000000 [ 55.872603] 5f20: 000051c7 00000000 db4c18c0 c04a9370 00015000 00001000 daf55f80 00001000 [ 55.880763] 5f40: daf54000 00015000 00000000 c00e53dc db4c18c0 c00e548c 0000000d 00008124 [ 55.888937] 5f60: 00000001 00000000 00000000 db4c18c0 db4c18c0 00001000 00015000 c00e5550 [ 55.897099] 5f80: 00000000 00000000 00001000 00001000 00015000 00000003 00000003 c000f364 [ 55.905239] 5fa0: 00000000 c000f1a0 00001000 00015000 00000003 00015000 00001000 0001333c [ 55.913399] 5fc0: 00001000 00015000 00000003 00000003 00000002 00000000 00000000 00000000 [ 55.921560] 5fe0: 7fffe000 be999850 0000a225 b6f3c19c 60000010 00000003 00000000 00000000 [ 55.929744] [<c034b0b4>] (charger_get_property) from [<c0346864>] (power_supply_show_property+0x48/0x20c) [ 55.939286] [<c0346864>] (power_supply_show_property) from [<c027f25c>] (dev_attr_show+0x1c/0x48) [ 55.948130] [<c027f25c>] (dev_attr_show) from [<c0146218>] (sysfs_kf_seq_show+0x84/0x104) [ 55.956298] [<c0146218>] (sysfs_kf_seq_show) from [<c0144c78>] (kernfs_seq_show+0x24/0x28) [ 55.964536] [<c0144c78>] (kernfs_seq_show) from [<c0107f90>] (seq_read+0x1b0/0x484) [ 55.972172] [<c0107f90>] (seq_read) from [<c00e53dc>] (__vfs_read+0x18/0x4c) [ 55.979188] [<c00e53dc>] (__vfs_read) from [<c00e548c>] (vfs_read+0x7c/0x100) [ 55.986304] [<c00e548c>] (vfs_read) from [<c00e5550>] (SyS_read+0x40/0x8c) [ 55.993164] [<c00e5550>] (SyS_read) from [<c000f1a0>] (ret_fast_syscall+0x0/0x48) [ 56.000626] Code: bad PC value [ 56.011652] ---[ end trace 7b64343fbdae8ef1 ]--- Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> [for the nvec part] Reviewed-by: Marc Dietrich <marvin24@gmx.de> [for compal-laptop.c] Acked-by: Darren Hart <dvhart@linux.intel.com> [for the mfd part] Acked-by: Lee Jones <lee.jones@linaro.org> [for the hid part] Acked-by: Jiri Kosina <jkosina@suse.cz> [for the acpi part] Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sebastian Reichel <sre@kernel.org>
300 lines
7.2 KiB
C
300 lines
7.2 KiB
C
/*
|
|
* linux/drivers/power/wm97xx_battery.c
|
|
*
|
|
* Battery measurement code for WM97xx
|
|
*
|
|
* based on tosa_battery.c
|
|
*
|
|
* Copyright (C) 2008 Marek Vasut <marek.vasut@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/power_supply.h>
|
|
#include <linux/wm97xx.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/slab.h>
|
|
|
|
static struct work_struct bat_work;
|
|
static DEFINE_MUTEX(work_lock);
|
|
static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
|
|
static enum power_supply_property *prop;
|
|
|
|
static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
|
|
{
|
|
struct wm97xx_pdata *wmdata = bat_ps->dev.parent->platform_data;
|
|
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
|
|
|
|
return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev.parent),
|
|
pdata->batt_aux) * pdata->batt_mult /
|
|
pdata->batt_div;
|
|
}
|
|
|
|
static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
|
|
{
|
|
struct wm97xx_pdata *wmdata = bat_ps->dev.parent->platform_data;
|
|
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
|
|
|
|
return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev.parent),
|
|
pdata->temp_aux) * pdata->temp_mult /
|
|
pdata->temp_div;
|
|
}
|
|
|
|
static int wm97xx_bat_get_property(struct power_supply *bat_ps,
|
|
enum power_supply_property psp,
|
|
union power_supply_propval *val)
|
|
{
|
|
struct wm97xx_pdata *wmdata = bat_ps->dev.parent->platform_data;
|
|
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
|
|
|
|
switch (psp) {
|
|
case POWER_SUPPLY_PROP_STATUS:
|
|
val->intval = bat_status;
|
|
break;
|
|
case POWER_SUPPLY_PROP_TECHNOLOGY:
|
|
val->intval = pdata->batt_tech;
|
|
break;
|
|
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
|
if (pdata->batt_aux >= 0)
|
|
val->intval = wm97xx_read_bat(bat_ps);
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case POWER_SUPPLY_PROP_TEMP:
|
|
if (pdata->temp_aux >= 0)
|
|
val->intval = wm97xx_read_temp(bat_ps);
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case POWER_SUPPLY_PROP_VOLTAGE_MAX:
|
|
if (pdata->max_voltage >= 0)
|
|
val->intval = pdata->max_voltage;
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case POWER_SUPPLY_PROP_VOLTAGE_MIN:
|
|
if (pdata->min_voltage >= 0)
|
|
val->intval = pdata->min_voltage;
|
|
else
|
|
return -EINVAL;
|
|
break;
|
|
case POWER_SUPPLY_PROP_PRESENT:
|
|
val->intval = 1;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void wm97xx_bat_external_power_changed(struct power_supply *bat_ps)
|
|
{
|
|
schedule_work(&bat_work);
|
|
}
|
|
|
|
static void wm97xx_bat_update(struct power_supply *bat_ps)
|
|
{
|
|
int old_status = bat_status;
|
|
struct wm97xx_pdata *wmdata = bat_ps->dev.parent->platform_data;
|
|
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
|
|
|
|
mutex_lock(&work_lock);
|
|
|
|
bat_status = (pdata->charge_gpio >= 0) ?
|
|
(gpio_get_value(pdata->charge_gpio) ?
|
|
POWER_SUPPLY_STATUS_DISCHARGING :
|
|
POWER_SUPPLY_STATUS_CHARGING) :
|
|
POWER_SUPPLY_STATUS_UNKNOWN;
|
|
|
|
if (old_status != bat_status) {
|
|
pr_debug("%s: %i -> %i\n", bat_ps->desc->name, old_status,
|
|
bat_status);
|
|
power_supply_changed(bat_ps);
|
|
}
|
|
|
|
mutex_unlock(&work_lock);
|
|
}
|
|
|
|
static struct power_supply *bat_psy;
|
|
static struct power_supply_desc bat_psy_desc = {
|
|
.type = POWER_SUPPLY_TYPE_BATTERY,
|
|
.get_property = wm97xx_bat_get_property,
|
|
.external_power_changed = wm97xx_bat_external_power_changed,
|
|
.use_for_apm = 1,
|
|
};
|
|
|
|
static void wm97xx_bat_work(struct work_struct *work)
|
|
{
|
|
wm97xx_bat_update(bat_psy);
|
|
}
|
|
|
|
static irqreturn_t wm97xx_chrg_irq(int irq, void *data)
|
|
{
|
|
schedule_work(&bat_work);
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
#ifdef CONFIG_PM
|
|
static int wm97xx_bat_suspend(struct device *dev)
|
|
{
|
|
flush_work(&bat_work);
|
|
return 0;
|
|
}
|
|
|
|
static int wm97xx_bat_resume(struct device *dev)
|
|
{
|
|
schedule_work(&bat_work);
|
|
return 0;
|
|
}
|
|
|
|
static const struct dev_pm_ops wm97xx_bat_pm_ops = {
|
|
.suspend = wm97xx_bat_suspend,
|
|
.resume = wm97xx_bat_resume,
|
|
};
|
|
#endif
|
|
|
|
static int wm97xx_bat_probe(struct platform_device *dev)
|
|
{
|
|
int ret = 0;
|
|
int props = 1; /* POWER_SUPPLY_PROP_PRESENT */
|
|
int i = 0;
|
|
struct wm97xx_pdata *wmdata = dev->dev.platform_data;
|
|
struct wm97xx_batt_pdata *pdata;
|
|
|
|
if (!wmdata) {
|
|
dev_err(&dev->dev, "No platform data supplied\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
pdata = wmdata->batt_pdata;
|
|
|
|
if (dev->id != -1)
|
|
return -EINVAL;
|
|
|
|
if (!pdata) {
|
|
dev_err(&dev->dev, "No platform_data supplied\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (gpio_is_valid(pdata->charge_gpio)) {
|
|
ret = gpio_request(pdata->charge_gpio, "BATT CHRG");
|
|
if (ret)
|
|
goto err;
|
|
ret = gpio_direction_input(pdata->charge_gpio);
|
|
if (ret)
|
|
goto err2;
|
|
ret = request_irq(gpio_to_irq(pdata->charge_gpio),
|
|
wm97xx_chrg_irq, 0,
|
|
"AC Detect", dev);
|
|
if (ret)
|
|
goto err2;
|
|
props++; /* POWER_SUPPLY_PROP_STATUS */
|
|
}
|
|
|
|
if (pdata->batt_tech >= 0)
|
|
props++; /* POWER_SUPPLY_PROP_TECHNOLOGY */
|
|
if (pdata->temp_aux >= 0)
|
|
props++; /* POWER_SUPPLY_PROP_TEMP */
|
|
if (pdata->batt_aux >= 0)
|
|
props++; /* POWER_SUPPLY_PROP_VOLTAGE_NOW */
|
|
if (pdata->max_voltage >= 0)
|
|
props++; /* POWER_SUPPLY_PROP_VOLTAGE_MAX */
|
|
if (pdata->min_voltage >= 0)
|
|
props++; /* POWER_SUPPLY_PROP_VOLTAGE_MIN */
|
|
|
|
prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
|
|
if (!prop) {
|
|
ret = -ENOMEM;
|
|
goto err3;
|
|
}
|
|
|
|
prop[i++] = POWER_SUPPLY_PROP_PRESENT;
|
|
if (pdata->charge_gpio >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_STATUS;
|
|
if (pdata->batt_tech >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_TECHNOLOGY;
|
|
if (pdata->temp_aux >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_TEMP;
|
|
if (pdata->batt_aux >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_NOW;
|
|
if (pdata->max_voltage >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_MAX;
|
|
if (pdata->min_voltage >= 0)
|
|
prop[i++] = POWER_SUPPLY_PROP_VOLTAGE_MIN;
|
|
|
|
INIT_WORK(&bat_work, wm97xx_bat_work);
|
|
|
|
if (!pdata->batt_name) {
|
|
dev_info(&dev->dev, "Please consider setting proper battery "
|
|
"name in platform definition file, falling "
|
|
"back to name \"wm97xx-batt\"\n");
|
|
bat_psy_desc.name = "wm97xx-batt";
|
|
} else
|
|
bat_psy_desc.name = pdata->batt_name;
|
|
|
|
bat_psy_desc.properties = prop;
|
|
bat_psy_desc.num_properties = props;
|
|
|
|
bat_psy = power_supply_register(&dev->dev, &bat_psy_desc, NULL);
|
|
if (!IS_ERR(bat_psy)) {
|
|
schedule_work(&bat_work);
|
|
} else {
|
|
ret = PTR_ERR(bat_psy);
|
|
goto err4;
|
|
}
|
|
|
|
return 0;
|
|
err4:
|
|
kfree(prop);
|
|
err3:
|
|
if (gpio_is_valid(pdata->charge_gpio))
|
|
free_irq(gpio_to_irq(pdata->charge_gpio), dev);
|
|
err2:
|
|
if (gpio_is_valid(pdata->charge_gpio))
|
|
gpio_free(pdata->charge_gpio);
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
static int wm97xx_bat_remove(struct platform_device *dev)
|
|
{
|
|
struct wm97xx_pdata *wmdata = dev->dev.platform_data;
|
|
struct wm97xx_batt_pdata *pdata = wmdata->batt_pdata;
|
|
|
|
if (pdata && gpio_is_valid(pdata->charge_gpio)) {
|
|
free_irq(gpio_to_irq(pdata->charge_gpio), dev);
|
|
gpio_free(pdata->charge_gpio);
|
|
}
|
|
cancel_work_sync(&bat_work);
|
|
power_supply_unregister(bat_psy);
|
|
kfree(prop);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver wm97xx_bat_driver = {
|
|
.driver = {
|
|
.name = "wm97xx-battery",
|
|
#ifdef CONFIG_PM
|
|
.pm = &wm97xx_bat_pm_ops,
|
|
#endif
|
|
},
|
|
.probe = wm97xx_bat_probe,
|
|
.remove = wm97xx_bat_remove,
|
|
};
|
|
|
|
module_platform_driver(wm97xx_bat_driver);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Marek Vasut <marek.vasut@gmail.com>");
|
|
MODULE_DESCRIPTION("WM97xx battery driver");
|