mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
![Krzysztof Kozlowski](/assets/img/avatar_default.png)
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>
217 lines
5.7 KiB
C
217 lines
5.7 KiB
C
/*
|
|
* max8998_charger.c - Power supply consumer driver for the Maxim 8998/LP3974
|
|
*
|
|
* Copyright (C) 2009-2010 Samsung Electronics
|
|
* MyungJoo Ham <myungjoo.ham@samsung.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/err.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/power_supply.h>
|
|
#include <linux/mfd/max8998.h>
|
|
#include <linux/mfd/max8998-private.h>
|
|
|
|
struct max8998_battery_data {
|
|
struct device *dev;
|
|
struct max8998_dev *iodev;
|
|
struct power_supply *battery;
|
|
};
|
|
|
|
static enum power_supply_property max8998_battery_props[] = {
|
|
POWER_SUPPLY_PROP_PRESENT, /* the presence of battery */
|
|
POWER_SUPPLY_PROP_ONLINE, /* charger is active or not */
|
|
};
|
|
|
|
/* Note that the charger control is done by a current regulator "CHARGER" */
|
|
static int max8998_battery_get_property(struct power_supply *psy,
|
|
enum power_supply_property psp,
|
|
union power_supply_propval *val)
|
|
{
|
|
struct max8998_battery_data *max8998 = power_supply_get_drvdata(psy);
|
|
struct i2c_client *i2c = max8998->iodev->i2c;
|
|
int ret;
|
|
u8 reg;
|
|
|
|
switch (psp) {
|
|
case POWER_SUPPLY_PROP_PRESENT:
|
|
ret = max8998_read_reg(i2c, MAX8998_REG_STATUS2, ®);
|
|
if (ret)
|
|
return ret;
|
|
if (reg & (1 << 4))
|
|
val->intval = 0;
|
|
else
|
|
val->intval = 1;
|
|
break;
|
|
case POWER_SUPPLY_PROP_ONLINE:
|
|
ret = max8998_read_reg(i2c, MAX8998_REG_STATUS2, ®);
|
|
if (ret)
|
|
return ret;
|
|
if (reg & (1 << 3))
|
|
val->intval = 0;
|
|
else
|
|
val->intval = 1;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct power_supply_desc max8998_battery_desc = {
|
|
.name = "max8998_pmic",
|
|
.type = POWER_SUPPLY_TYPE_BATTERY,
|
|
.get_property = max8998_battery_get_property,
|
|
.properties = max8998_battery_props,
|
|
.num_properties = ARRAY_SIZE(max8998_battery_props),
|
|
};
|
|
|
|
static int max8998_battery_probe(struct platform_device *pdev)
|
|
{
|
|
struct max8998_dev *iodev = dev_get_drvdata(pdev->dev.parent);
|
|
struct max8998_platform_data *pdata = dev_get_platdata(iodev->dev);
|
|
struct power_supply_config psy_cfg = {};
|
|
struct max8998_battery_data *max8998;
|
|
struct i2c_client *i2c;
|
|
int ret = 0;
|
|
|
|
if (!pdata) {
|
|
dev_err(pdev->dev.parent, "No platform init data supplied\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
max8998 = devm_kzalloc(&pdev->dev, sizeof(struct max8998_battery_data),
|
|
GFP_KERNEL);
|
|
if (!max8998)
|
|
return -ENOMEM;
|
|
|
|
max8998->dev = &pdev->dev;
|
|
max8998->iodev = iodev;
|
|
platform_set_drvdata(pdev, max8998);
|
|
i2c = max8998->iodev->i2c;
|
|
|
|
/* Setup "End of Charge" */
|
|
/* If EOC value equals 0,
|
|
* remain value set from bootloader or default value */
|
|
if (pdata->eoc >= 10 && pdata->eoc <= 45) {
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR1,
|
|
(pdata->eoc / 5 - 2) << 5, 0x7 << 5);
|
|
} else if (pdata->eoc == 0) {
|
|
dev_dbg(max8998->dev,
|
|
"EOC value not set: leave it unchanged.\n");
|
|
} else {
|
|
dev_err(max8998->dev, "Invalid EOC value\n");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
/* Setup Charge Restart Level */
|
|
switch (pdata->restart) {
|
|
case 100:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR1, 0x1 << 3, 0x3 << 3);
|
|
break;
|
|
case 150:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR1, 0x0 << 3, 0x3 << 3);
|
|
break;
|
|
case 200:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR1, 0x2 << 3, 0x3 << 3);
|
|
break;
|
|
case -1:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR1, 0x3 << 3, 0x3 << 3);
|
|
break;
|
|
case 0:
|
|
dev_dbg(max8998->dev,
|
|
"Restart Level not set: leave it unchanged.\n");
|
|
break;
|
|
default:
|
|
dev_err(max8998->dev, "Invalid Restart Level\n");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
/* Setup Charge Full Timeout */
|
|
switch (pdata->timeout) {
|
|
case 5:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR2, 0x0 << 4, 0x3 << 4);
|
|
break;
|
|
case 6:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR2, 0x1 << 4, 0x3 << 4);
|
|
break;
|
|
case 7:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR2, 0x2 << 4, 0x3 << 4);
|
|
break;
|
|
case -1:
|
|
max8998_update_reg(i2c, MAX8998_REG_CHGR2, 0x3 << 4, 0x3 << 4);
|
|
break;
|
|
case 0:
|
|
dev_dbg(max8998->dev,
|
|
"Full Timeout not set: leave it unchanged.\n");
|
|
break;
|
|
default:
|
|
dev_err(max8998->dev, "Invalid Full Timeout value\n");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
|
|
psy_cfg.drv_data = max8998;
|
|
|
|
max8998->battery = power_supply_register(max8998->dev,
|
|
&max8998_battery_desc,
|
|
&psy_cfg);
|
|
if (IS_ERR(max8998->battery)) {
|
|
ret = PTR_ERR(max8998->battery);
|
|
dev_err(max8998->dev, "failed: power supply register: %d\n",
|
|
ret);
|
|
goto err;
|
|
}
|
|
|
|
return 0;
|
|
err:
|
|
return ret;
|
|
}
|
|
|
|
static int max8998_battery_remove(struct platform_device *pdev)
|
|
{
|
|
struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);
|
|
|
|
power_supply_unregister(max8998->battery);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct platform_device_id max8998_battery_id[] = {
|
|
{ "max8998-battery", TYPE_MAX8998 },
|
|
{ }
|
|
};
|
|
|
|
static struct platform_driver max8998_battery_driver = {
|
|
.driver = {
|
|
.name = "max8998-battery",
|
|
},
|
|
.probe = max8998_battery_probe,
|
|
.remove = max8998_battery_remove,
|
|
.id_table = max8998_battery_id,
|
|
};
|
|
|
|
module_platform_driver(max8998_battery_driver);
|
|
|
|
MODULE_DESCRIPTION("MAXIM 8998 battery control driver");
|
|
MODULE_AUTHOR("MyungJoo Ham <myungjoo.ham@samsung.com>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:max8998-battery");
|