linaro-dev September 2012

linaro-dev@lists.linaro.org

84 participants
100 discussions

Re: Re: [PATCH 1/3] devfreq: core updates to support devices which can idle

by MyungJoo Ham

> On 10 September 2012 14:43, 함명주 <myungjoo.ham(a)samsung.com> wrote: > >> Prepare devfreq core framework to support devices which > >> can idle. When device idleness is detected perhaps through > >> runtime-pm, need some mechanism to suspend devfreq load > >> monitoring and resume back when device is online. Present > >> code continues monitoring unless device is removed from > >> devfreq core. > >> > >> This patch introduces following design changes, > >> > >> - use per device work instead of global work to monitor device > >> load. This enables suspend/resume of device devfreq and > >> reduces monitoring code complexity. > >> - decouple delayed work based load monitoring logic from core > >> by introducing helpers functions to be used by governors. This > >> provides flexibility for governors either to use delayed work > >> based monitoring functions or to implement their own mechanism. > >> - devfreq core interacts with governors via events to perform > >> specific actions. These events include start/stop devfreq. > >> This sets ground for adding suspend/resume events. > >> > >> The devfreq apis are not modified and are kept intact. > > > > Hello, > > > > Please revise locking mechanism along with event handler. > > > > It appears that we need to do mutex_lock(&devfreq->lock) before calling devfreq->governor->event_handler(); > > I don't think is the case. The governor can make use of devfreq->lock if needed. > Anyways, I have revised locking mechanism in v2 set. > > > Or at least, userspace_init and userspace_exit functions require mutex_lock. > > The userspace_init function is executed only when device is added to devfreq > framework. This function itself is creating sysfs attributes. So this should not > be a concern for us. > > The userspace_exit is executed when device is removed from devfreq > framework. sysfs_remove_group() should take care of serving any pending > reference to sysfs attributes before removing them. No concern here as well. > Am I missing something which demand locking for these functions? > > > Event_handler callback won't want the properties in devfreq to be changed externally during its execution. > > Agree. If so, the GOV_INTERVAL handler of ondemand requires mutex_lock. (and probably, nested mutex lock for monitor_resume) It determins next action based on the value protected by the devfreq lock. It won't crash the kernel and it won't happen often. However, it may behave incorrectly. Why don't we simply let the all the struct devfreq protected when the external code (governors) is probably reading/writing the protected values? This also guarantees that the event handler gets the exact status modified by the event caller. Otherwise, the event handler may get status different from the event caller's intention. Cheers! MyungJoo > > > > > Plus, please edit Documentation/ABI entry (central_polling is being removed) > Done. > > > > Other than that, it looks fine. > > > > Cheers! > > MyungJoo > > > >> > >> Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> > >> --- > >> drivers/devfreq/devfreq.c | 376 ++++++++++-------------------- > >> drivers/devfreq/governor.h | 9 + > >> drivers/devfreq/governor_performance.c | 16 +- > >> drivers/devfreq/governor_powersave.c | 16 +- > >> drivers/devfreq/governor_simpleondemand.c | 33 +++ > >> drivers/devfreq/governor_userspace.c | 23 +- > >> include/linux/devfreq.h | 31 +-- > >> 7 files changed, 220 insertions(+), 284 deletions(-) > >> > >> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > >> index b146d76..be524c7 100644 > >> --- a/drivers/devfreq/devfreq.c > >> +++ b/drivers/devfreq/devfreq.c > >> @@ -30,17 +30,11 @@ > >> struct class *devfreq_class; > >> > >> /* > >> - * devfreq_work periodically monitors every registered device. > >> - * The minimum polling interval is one jiffy. The polling interval is > >> - * determined by the minimum polling period among all polling devfreq > >> - * devices. The resolution of polling interval is one jiffy. > >> + * devfreq core provides delayed work based load monitoring helper > >> + * functions. Governors can use these or can implement their own > >> + * monitoring mechanism. > >> */ > >> -static bool polling; > >> static struct workqueue_struct *devfreq_wq; > >> -static struct delayed_work devfreq_work; > >> - > >> -/* wait removing if this is to be removed */ > >> -static struct devfreq *wait_remove_device; > >> > >> /* The list of all device-devfreq */ > >> static LIST_HEAD(devfreq_list); > >> @@ -72,6 +66,8 @@ static struct devfreq *find_device_devfreq(struct device *dev) > >> return ERR_PTR(-ENODEV); > >> } > >> > >> +/* Load monitoring helper functions for governors use */ > >> + > >> /** > >> * update_devfreq() - Reevaluate the device and configure frequency. > >> * @devfreq: the devfreq instance. > >> @@ -121,6 +117,90 @@ int update_devfreq(struct devfreq *devfreq) > >> } > >> > >> /** > >> + * devfreq_monitor() - Periodically poll devfreq objects. > >> + * @work: the work struct used to run devfreq_monitor periodically. > >> + * > >> + */ > >> +static void devfreq_monitor(struct work_struct *work) > >> +{ > >> + int err; > >> + struct devfreq *devfreq = container_of(work, > >> + struct devfreq, work.work); > >> + > >> + mutex_lock(&devfreq->lock); > >> + err = update_devfreq(devfreq); > >> + mutex_unlock(&devfreq->lock); > >> + if (err) > >> + dev_err(&devfreq->dev, "dvfs failed with (%d) error\n", err); > >> + > >> + queue_delayed_work(devfreq_wq, &devfreq->work, > >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> +} > >> + > >> +/** > >> + * devfreq_monitor_start() - Start load monitoring of devfreq instance > >> + * using default delayed work > >> + * @devfreq: the devfreq instance. > >> + * > >> + * Returns 0 if monitoring started, non-zero otherwise. > >> + * Note: This function is exported for governors. > >> + */ > >> +int devfreq_monitor_start(struct devfreq *devfreq) > >> +{ > >> + INIT_DEFERRABLE_WORK(&devfreq->work, devfreq_monitor); > >> + return !queue_delayed_work(devfreq_wq, &devfreq->work, > >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> +} > >> + > >> +/** > >> + * devfreq_monitor_stop() - Stop load monitoring of a devfreq instance > >> + * @devfreq: the devfreq instance. > >> + * > >> + * Note: This function is exported for governors. > >> + */ > >> +void devfreq_monitor_stop(struct devfreq *devfreq) > >> +{ > >> + cancel_delayed_work_sync(&devfreq->work); > >> +} > >> + > >> +/** > >> + * devfreq_monitor_suspend() - Suspend load monitoring of a devfreq instance > >> + * @devfreq: the devfreq instance. > >> + * > >> + * Note: This function is exported for governors. > >> + */ > >> +int devfreq_monitor_suspend(struct devfreq *devfreq) > >> +{ > >> + int ret = -EPERM; > >> + > >> + if (delayed_work_pending(&devfreq->work)) { > >> + cancel_delayed_work_sync(&devfreq->work); > >> + ret = 0; > >> + } > >> + > >> + return ret; > >> +} > >> + > >> +/** > >> + * devfreq_monitor_resume() - Resume load monitoring of a devfreq instance > >> + * @devfreq: the devfreq instance. > >> + * > >> + * Returns 0 if monitoring re-started, non-zero otherwise. > >> + * Note: This function is exported for governors. > >> + */ > >> +int devfreq_monitor_resume(struct devfreq *devfreq) > >> +{ > >> + int ret = -EPERM; > >> + > >> + if (!delayed_work_pending(&devfreq->work)) { > >> + ret = !queue_delayed_work(devfreq_wq, &devfreq->work, > >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> + } > >> + > >> + return ret; > >> +} > >> + > >> +/** > >> * devfreq_notifier_call() - Notify that the device frequency requirements > >> * has been changed out of devfreq framework. > >> * @nb the notifier_block (supposed to be devfreq->nb) > >> @@ -143,59 +223,33 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, > >> } > >> > >> /** > >> - * _remove_devfreq() - Remove devfreq from the device. > >> + * _remove_devfreq() - Remove devfreq from the devfreq list and > >> + release its resources. > >> * @devfreq: the devfreq struct > >> * @skip: skip calling device_unregister(). > >> - * > >> - * Note that the caller should lock devfreq->lock before calling > >> - * this. _remove_devfreq() will unlock it and free devfreq > >> - * internally. devfreq_list_lock should be locked by the caller > >> - * as well (not relased at return) > >> - * > >> - * Lock usage: > >> - * devfreq->lock: locked before call. > >> - * unlocked at return (and freed) > >> - * devfreq_list_lock: locked before call. > >> - * kept locked at return. > >> - * if devfreq is centrally polled. > >> - * > >> - * Freed memory: > >> - * devfreq > >> */ > >> static void _remove_devfreq(struct devfreq *devfreq, bool skip) > >> { > >> - if (!mutex_is_locked(&devfreq->lock)) { > >> - WARN(true, "devfreq->lock must be locked by the caller.\n"); > >> - return; > >> - } > >> - if (!devfreq->governor->no_central_polling && > >> - !mutex_is_locked(&devfreq_list_lock)) { > >> - WARN(true, "devfreq_list_lock must be locked by the caller.\n"); > >> + mutex_lock(&devfreq_list_lock); > >> + if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) { > >> + mutex_unlock(&devfreq_list_lock); > >> + dev_warn(&devfreq->dev, "releasing devfreq which doesn't exist\n"); > >> return; > >> } > >> + list_del(&devfreq->node); > >> + mutex_unlock(&devfreq_list_lock); > >> > >> - if (devfreq->being_removed) > >> - return; > >> - > >> - devfreq->being_removed = true; > >> + devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_STOP); > >> > >> if (devfreq->profile->exit) > >> devfreq->profile->exit(devfreq->dev.parent); > >> > >> - if (devfreq->governor->exit) > >> - devfreq->governor->exit(devfreq); > >> - > >> if (!skip && get_device(&devfreq->dev)) { > >> device_unregister(&devfreq->dev); > >> put_device(&devfreq->dev); > >> } > >> > >> - if (!devfreq->governor->no_central_polling) > >> - list_del(&devfreq->node); > >> - > >> - mutex_unlock(&devfreq->lock); > >> mutex_destroy(&devfreq->lock); > >> - > >> kfree(devfreq); > >> } > >> > >> @@ -210,130 +264,8 @@ static void _remove_devfreq(struct devfreq *devfreq, bool skip) > >> static void devfreq_dev_release(struct device *dev) > >> { > >> struct devfreq *devfreq = to_devfreq(dev); > >> - bool central_polling = !devfreq->governor->no_central_polling; > >> - > >> - /* > >> - * If devfreq_dev_release() was called by device_unregister() of > >> - * _remove_devfreq(), we cannot mutex_lock(&devfreq->lock) and > >> - * being_removed is already set. This also partially checks the case > >> - * where devfreq_dev_release() is called from a thread other than > >> - * the one called _remove_devfreq(); however, this case is > >> - * dealt completely with another following being_removed check. > >> - * > >> - * Because being_removed is never being > >> - * unset, we do not need to worry about race conditions on > >> - * being_removed. > >> - */ > >> - if (devfreq->being_removed) > >> - return; > >> - > >> - if (central_polling) > >> - mutex_lock(&devfreq_list_lock); > >> - > >> - mutex_lock(&devfreq->lock); > >> - > >> - /* > >> - * Check being_removed flag again for the case where > >> - * devfreq_dev_release() was called in a thread other than the one > >> - * possibly called _remove_devfreq(). > >> - */ > >> - if (devfreq->being_removed) { > >> - mutex_unlock(&devfreq->lock); > >> - goto out; > >> - } > >> > >> - /* devfreq->lock is unlocked and removed in _removed_devfreq() */ > >> _remove_devfreq(devfreq, true); > >> - > >> -out: > >> - if (central_polling) > >> - mutex_unlock(&devfreq_list_lock); > >> -} > >> - > >> -/** > >> - * devfreq_monitor() - Periodically poll devfreq objects. > >> - * @work: the work struct used to run devfreq_monitor periodically. > >> - * > >> - */ > >> -static void devfreq_monitor(struct work_struct *work) > >> -{ > >> - static unsigned long last_polled_at; > >> - struct devfreq *devfreq, *tmp; > >> - int error; > >> - unsigned long jiffies_passed; > >> - unsigned long next_jiffies = ULONG_MAX, now = jiffies; > >> - struct device *dev; > >> - > >> - /* Initially last_polled_at = 0, polling every device at bootup */ > >> - jiffies_passed = now - last_polled_at; > >> - last_polled_at = now; > >> - if (jiffies_passed == 0) > >> - jiffies_passed = 1; > >> - > >> - mutex_lock(&devfreq_list_lock); > >> - list_for_each_entry_safe(devfreq, tmp, &devfreq_list, node) { > >> - mutex_lock(&devfreq->lock); > >> - dev = devfreq->dev.parent; > >> - > >> - /* Do not remove tmp for a while */ > >> - wait_remove_device = tmp; > >> - > >> - if (devfreq->governor->no_central_polling || > >> - devfreq->next_polling == 0) { > >> - mutex_unlock(&devfreq->lock); > >> - continue; > >> - } > >> - mutex_unlock(&devfreq_list_lock); > >> - > >> - /* > >> - * Reduce more next_polling if devfreq_wq took an extra > >> - * delay. (i.e., CPU has been idled.) > >> - */ > >> - if (devfreq->next_polling <= jiffies_passed) { > >> - error = update_devfreq(devfreq); > >> - > >> - /* Remove a devfreq with an error. */ > >> - if (error && error != -EAGAIN) { > >> - > >> - dev_err(dev, "Due to update_devfreq error(%d), devfreq(%s) is removed from the device\n", > >> - error, devfreq->governor->name); > >> - > >> - /* > >> - * Unlock devfreq before locking the list > >> - * in order to avoid deadlock with > >> - * find_device_devfreq or others > >> - */ > >> - mutex_unlock(&devfreq->lock); > >> - mutex_lock(&devfreq_list_lock); > >> - /* Check if devfreq is already removed */ > >> - if (IS_ERR(find_device_devfreq(dev))) > >> - continue; > >> - mutex_lock(&devfreq->lock); > >> - /* This unlocks devfreq->lock and free it */ > >> - _remove_devfreq(devfreq, false); > >> - continue; > >> - } > >> - devfreq->next_polling = devfreq->polling_jiffies; > >> - } else { > >> - devfreq->next_polling -= jiffies_passed; > >> - } > >> - > >> - if (devfreq->next_polling) > >> - next_jiffies = (next_jiffies > devfreq->next_polling) ? > >> - devfreq->next_polling : next_jiffies; > >> - > >> - mutex_unlock(&devfreq->lock); > >> - mutex_lock(&devfreq_list_lock); > >> - } > >> - wait_remove_device = NULL; > >> - mutex_unlock(&devfreq_list_lock); > >> - > >> - if (next_jiffies > 0 && next_jiffies < ULONG_MAX) { > >> - polling = true; > >> - queue_delayed_work(devfreq_wq, &devfreq_work, next_jiffies); > >> - } else { > >> - polling = false; > >> - } > >> } > >> > >> /** > >> @@ -357,16 +289,13 @@ struct devfreq *devfreq_add_device(struct device *dev, > >> return ERR_PTR(-EINVAL); > >> } > >> > >> - > >> - if (!governor->no_central_polling) { > >> - mutex_lock(&devfreq_list_lock); > >> - devfreq = find_device_devfreq(dev); > >> - mutex_unlock(&devfreq_list_lock); > >> - if (!IS_ERR(devfreq)) { > >> - dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__); > >> - err = -EINVAL; > >> - goto err_out; > >> - } > >> + mutex_lock(&devfreq_list_lock); > >> + devfreq = find_device_devfreq(dev); > >> + mutex_unlock(&devfreq_list_lock); > >> + if (!IS_ERR(devfreq)) { > >> + dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__); > >> + err = -EINVAL; > >> + goto err_out; > >> } > >> > >> devfreq = kzalloc(sizeof(struct devfreq), GFP_KERNEL); > >> @@ -386,48 +315,40 @@ struct devfreq *devfreq_add_device(struct device *dev, > >> devfreq->governor = governor; > >> devfreq->previous_freq = profile->initial_freq; > >> devfreq->data = data; > >> - devfreq->next_polling = devfreq->polling_jiffies > >> - = msecs_to_jiffies(devfreq->profile->polling_ms); > >> devfreq->nb.notifier_call = devfreq_notifier_call; > >> > >> dev_set_name(&devfreq->dev, dev_name(dev)); > >> err = device_register(&devfreq->dev); > >> if (err) { > >> put_device(&devfreq->dev); > >> + mutex_unlock(&devfreq->lock); > >> goto err_dev; > >> } > >> > >> - if (governor->init) > >> - err = governor->init(devfreq); > >> - if (err) > >> - goto err_init; > >> - > >> mutex_unlock(&devfreq->lock); > >> > >> - if (governor->no_central_polling) > >> - goto out; > >> - > >> mutex_lock(&devfreq_list_lock); > >> - > >> list_add(&devfreq->node, &devfreq_list); > >> + mutex_unlock(&devfreq_list_lock); > >> > >> - if (devfreq_wq && devfreq->next_polling && !polling) { > >> - polling = true; > >> - queue_delayed_work(devfreq_wq, &devfreq_work, > >> - devfreq->next_polling); > >> + err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START); > >> + if (err) { > >> + dev_err(dev, "%s: Unable to start governor for the device\n", > >> + __func__); > >> + goto err_init; > >> } > >> - mutex_unlock(&devfreq_list_lock); > >> -out: > >> + > >> return devfreq; > >> > >> err_init: > >> + list_del(&devfreq->node); > >> device_unregister(&devfreq->dev); > >> err_dev: > >> - mutex_unlock(&devfreq->lock); > >> kfree(devfreq); > >> err_out: > >> return ERR_PTR(err); > >> } > >> +EXPORT_SYMBOL(devfreq_add_device); > >> > >> /** > >> * devfreq_remove_device() - Remove devfreq feature from a device. > >> @@ -435,30 +356,14 @@ err_out: > >> */ > >> int devfreq_remove_device(struct devfreq *devfreq) > >> { > >> - bool central_polling; > >> - > >> if (!devfreq) > >> return -EINVAL; > >> > >> - central_polling = !devfreq->governor->no_central_polling; > >> - > >> - if (central_polling) { > >> - mutex_lock(&devfreq_list_lock); > >> - while (wait_remove_device == devfreq) { > >> - mutex_unlock(&devfreq_list_lock); > >> - schedule(); > >> - mutex_lock(&devfreq_list_lock); > >> - } > >> - } > >> - > >> - mutex_lock(&devfreq->lock); > >> - _remove_devfreq(devfreq, false); /* it unlocks devfreq->lock */ > >> - > >> - if (central_polling) > >> - mutex_unlock(&devfreq_list_lock); > >> + _remove_devfreq(devfreq, false); > >> > >> return 0; > >> } > >> +EXPORT_SYMBOL(devfreq_remove_device); > >> > >> static ssize_t show_governor(struct device *dev, > >> struct device_attribute *attr, char *buf) > >> @@ -492,33 +397,15 @@ static ssize_t store_polling_interval(struct device *dev, > >> > >> mutex_lock(&df->lock); > >> df->profile->polling_ms = value; > >> - df->next_polling = df->polling_jiffies > >> - = msecs_to_jiffies(value); > >> mutex_unlock(&df->lock); > >> > >> + df->governor->event_handler(df, DEVFREQ_GOV_INTERVAL); > >> ret = count; > >> > >> - if (df->governor->no_central_polling) > >> - goto out; > >> - > >> - mutex_lock(&devfreq_list_lock); > >> - if (df->next_polling > 0 && !polling) { > >> - polling = true; > >> - queue_delayed_work(devfreq_wq, &devfreq_work, > >> - df->next_polling); > >> - } > >> - mutex_unlock(&devfreq_list_lock); > >> out: > >> return ret; > >> } > >> > >> -static ssize_t show_central_polling(struct device *dev, > >> - struct device_attribute *attr, char *buf) > >> -{ > >> - return sprintf(buf, "%d\n", > >> - !to_devfreq(dev)->governor->no_central_polling); > >> -} > >> - > >> static ssize_t store_min_freq(struct device *dev, struct device_attribute *attr, > >> const char *buf, size_t count) > >> { > >> @@ -590,7 +477,6 @@ static ssize_t show_max_freq(struct device *dev, struct device_attribute *attr, > >> static struct device_attribute devfreq_attrs[] = { > >> __ATTR(governor, S_IRUGO, show_governor, NULL), > >> __ATTR(cur_freq, S_IRUGO, show_freq, NULL), > >> - __ATTR(central_polling, S_IRUGO, show_central_polling, NULL), > >> __ATTR(polling_interval, S_IRUGO | S_IWUSR, show_polling_interval, > >> store_polling_interval), > >> __ATTR(min_freq, S_IRUGO | S_IWUSR, show_min_freq, store_min_freq), > >> @@ -598,23 +484,6 @@ static struct device_attribute devfreq_attrs[] = { > >> { }, > >> }; > >> > >> -/** > >> - * devfreq_start_polling() - Initialize data structure for devfreq framework and > >> - * start polling registered devfreq devices. > >> - */ > >> -static int __init devfreq_start_polling(void) > >> -{ > >> - mutex_lock(&devfreq_list_lock); > >> - polling = false; > >> - devfreq_wq = create_freezable_workqueue("devfreq_wq"); > >> - INIT_DEFERRABLE_WORK(&devfreq_work, devfreq_monitor); > >> - mutex_unlock(&devfreq_list_lock); > >> - > >> - devfreq_monitor(&devfreq_work.work); > >> - return 0; > >> -} > >> -late_initcall(devfreq_start_polling); > >> - > >> static int __init devfreq_init(void) > >> { > >> devfreq_class = class_create(THIS_MODULE, "devfreq"); > >> @@ -622,7 +491,15 @@ static int __init devfreq_init(void) > >> pr_err("%s: couldn't create class\n", __FILE__); > >> return PTR_ERR(devfreq_class); > >> } > >> + > >> + devfreq_wq = create_freezable_workqueue("devfreq_wq"); > >> + if (IS_ERR(devfreq_wq)) { > >> + class_destroy(devfreq_class); > >> + pr_err("%s: couldn't create workqueue\n", __FILE__); > >> + return PTR_ERR(devfreq_wq); > >> + } > >> devfreq_class->dev_attrs = devfreq_attrs; > >> + > >> return 0; > >> } > >> subsys_initcall(devfreq_init); > >> @@ -630,6 +507,7 @@ subsys_initcall(devfreq_init); > >> static void __exit devfreq_exit(void) > >> { > >> class_destroy(devfreq_class); > >> + destroy_workqueue(devfreq_wq); > >> } > >> module_exit(devfreq_exit); > >> > >> diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h > >> index ea7f13c..4a86af7 100644 > >> --- a/drivers/devfreq/governor.h > >> +++ b/drivers/devfreq/governor.h > >> @@ -18,7 +18,16 @@ > >> > >> #define to_devfreq(DEV) container_of((DEV), struct devfreq, dev) > >> > >> +/* Devfreq events */ > >> +#define DEVFREQ_GOV_START 0x1 > >> +#define DEVFREQ_GOV_STOP 0x2 > >> +#define DEVFREQ_GOV_INTERVAL 0x3 > >> + > >> /* Caution: devfreq->lock must be locked before calling update_devfreq */ > >> extern int update_devfreq(struct devfreq *devfreq); > >> > >> +extern int devfreq_monitor_start(struct devfreq *devfreq); > >> +extern void devfreq_monitor_stop(struct devfreq *devfreq); > >> +extern int devfreq_monitor_suspend(struct devfreq *devfreq); > >> +extern int devfreq_monitor_resume(struct devfreq *devfreq); > >> #endif /* _GOVERNOR_H */ > >> diff --git a/drivers/devfreq/governor_performance.c b/drivers/devfreq/governor_performance.c > >> index af75ddd..b657eff 100644 > >> --- a/drivers/devfreq/governor_performance.c > >> +++ b/drivers/devfreq/governor_performance.c > >> @@ -26,14 +26,22 @@ static int devfreq_performance_func(struct devfreq *df, > >> return 0; > >> } > >> > >> -static int performance_init(struct devfreq *devfreq) > >> +static int devfreq_performance_handler(struct devfreq *devfreq, > >> + unsigned int event) > >> { > >> - return update_devfreq(devfreq); > >> + int ret = 0; > >> + > >> + if (event == DEVFREQ_GOV_START) { > >> + mutex_lock(&devfreq->lock); > >> + ret = update_devfreq(devfreq); > >> + mutex_unlock(&devfreq->lock); > >> + } > >> + > >> + return ret; > >> } > >> > >> const struct devfreq_governor devfreq_performance = { > >> .name = "performance", > >> - .init = performance_init, > >> .get_target_freq = devfreq_performance_func, > >> - .no_central_polling = true, > >> + .event_handler = devfreq_performance_handler, > >> }; > >> diff --git a/drivers/devfreq/governor_powersave.c b/drivers/devfreq/governor_powersave.c > >> index fec0cdb..daa5732 100644 > >> --- a/drivers/devfreq/governor_powersave.c > >> +++ b/drivers/devfreq/governor_powersave.c > >> @@ -23,14 +23,22 @@ static int devfreq_powersave_func(struct devfreq *df, > >> return 0; > >> } > >> > >> -static int powersave_init(struct devfreq *devfreq) > >> +static int devfreq_powersave_handler(struct devfreq *devfreq, > >> + unsigned int event) > >> { > >> - return update_devfreq(devfreq); > >> + int ret = 0; > >> + > >> + if (event == DEVFREQ_GOV_START) { > >> + mutex_lock(&devfreq->lock); > >> + ret = update_devfreq(devfreq); > >> + mutex_unlock(&devfreq->lock); > >> + } > >> + > >> + return ret; > >> } > >> > >> const struct devfreq_governor devfreq_powersave = { > >> .name = "powersave", > >> - .init = powersave_init, > >> .get_target_freq = devfreq_powersave_func, > >> - .no_central_polling = true, > >> + .event_handler = devfreq_powersave_handler, > >> }; > >> diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c > >> index a2e3eae..9802bf9 100644 > >> --- a/drivers/devfreq/governor_simpleondemand.c > >> +++ b/drivers/devfreq/governor_simpleondemand.c > >> @@ -12,6 +12,7 @@ > >> #include <linux/errno.h> > >> #include <linux/devfreq.h> > >> #include <linux/math64.h> > >> +#include "governor.h" > >> > >> /* Default constants for DevFreq-Simple-Ondemand (DFSO) */ > >> #define DFSO_UPTHRESHOLD (90) > >> @@ -88,7 +89,39 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, > >> return 0; > >> } > >> > >> +int devfreq_simple_ondemand_handler(struct devfreq *devfreq, > >> + unsigned int event) > >> +{ > >> + int ret = 0; > >> + > >> + switch (event) { > >> + case DEVFREQ_GOV_START: > >> + ret = devfreq_monitor_start(devfreq); > >> + break; > >> + > >> + case DEVFREQ_GOV_STOP: > >> + devfreq_monitor_stop(devfreq); > >> + break; > >> + > >> + case DEVFREQ_GOV_INTERVAL: > >> + /* > >> + * if polling interval is set to zero, stop monitoring. > >> + * otherwise resume load monitoring. > >> + */ > >> + if (!devfreq->profile->polling_ms) > >> + ret = devfreq_monitor_suspend(devfreq); > >> + else > >> + ret = devfreq_monitor_resume(devfreq); > >> + break; > >> + default: > >> + break; > >> + } > >> + > >> + return ret; > >> +} > >> + > >> const struct devfreq_governor devfreq_simple_ondemand = { > >> .name = "simple_ondemand", > >> .get_target_freq = devfreq_simple_ondemand_func, > >> + .event_handler = devfreq_simple_ondemand_handler, > >> }; > >> diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c > >> index 0681246..c48fca0 100644 > >> --- a/drivers/devfreq/governor_userspace.c > >> +++ b/drivers/devfreq/governor_userspace.c > >> @@ -116,10 +116,27 @@ static void userspace_exit(struct devfreq *devfreq) > >> devfreq->data = NULL; > >> } > >> > >> +int devfreq_userspace_handler(struct devfreq *devfreq, > >> + unsigned int event) > >> +{ > >> + int ret = 0; > >> + > >> + switch (event) { > >> + case DEVFREQ_GOV_START: > >> + ret = userspace_init(devfreq); > >> + break; > >> + case DEVFREQ_GOV_STOP: > >> + userspace_exit(devfreq); > >> + break; > >> + default: > >> + break; > >> + } > >> + > >> + return ret; > >> +} > >> + > >> const struct devfreq_governor devfreq_userspace = { > >> .name = "userspace", > >> .get_target_freq = devfreq_userspace_func, > >> - .init = userspace_init, > >> - .exit = userspace_exit, > >> - .no_central_polling = true, > >> + .event_handler = devfreq_userspace_handler, > >> }; > >> diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h > >> index 281c72a..7a11c3e 100644 > >> --- a/include/linux/devfreq.h > >> +++ b/include/linux/devfreq.h > >> @@ -91,25 +91,17 @@ struct devfreq_dev_profile { > >> * status of the device (load = busy_time / total_time). > >> * If no_central_polling is set, this callback is called > >> * only with update_devfreq() notified by OPP. > >> - * @init Called when the devfreq is being attached to a device > >> - * @exit Called when the devfreq is being removed from a > >> - * device. Governor should stop any internal routines > >> - * before return because related data may be > >> - * freed after exit(). > >> - * @no_central_polling Do not use devfreq's central polling mechanism. > >> - * When this is set, devfreq will not call > >> - * get_target_freq with devfreq_monitor(). However, > >> - * devfreq will call get_target_freq with > >> - * devfreq_update() notified by OPP framework. > >> + * @event_handler Callback for devfreq core framework to notify events > >> + * to governors. Events include per device governor > >> + * init and exit, opp changes out of devfreq, suspend > >> + * and resume of per device devfreq during device idle. > >> * > >> * Note that the callbacks are called with devfreq->lock locked by devfreq. > >> */ > >> struct devfreq_governor { > >> const char name[DEVFREQ_NAME_LEN]; > >> int (*get_target_freq)(struct devfreq *this, unsigned long *freq); > >> - int (*init)(struct devfreq *this); > >> - void (*exit)(struct devfreq *this); > >> - const bool no_central_polling; > >> + int (*event_handler)(struct devfreq *devfreq, unsigned int event); > >> }; > >> > >> /** > >> @@ -124,16 +116,10 @@ struct devfreq_governor { > >> * @nb notifier block used to notify devfreq object that it should > >> * reevaluate operable frequencies. Devfreq users may use > >> * devfreq.nb to the corresponding register notifier call chain. > >> - * @polling_jiffies interval in jiffies. > >> + * @work delayed work for load monitoring. > >> * @previous_freq previously configured frequency value. > >> - * @next_polling the number of remaining jiffies to poll with > >> - * "devfreq_monitor" executions to reevaluate > >> - * frequency/voltage of the device. Set by > >> - * profile's polling_ms interval. > >> * @data Private data of the governor. The devfreq framework does not > >> * touch this. > >> - * @being_removed a flag to mark that this object is being removed in > >> - * order to prevent trying to remove the object multiple times. > >> * @min_freq Limit minimum frequency requested by user (0: none) > >> * @max_freq Limit maximum frequency requested by user (0: none) > >> * > >> @@ -153,15 +139,12 @@ struct devfreq { > >> struct devfreq_dev_profile *profile; > >> const struct devfreq_governor *governor; > >> struct notifier_block nb; > >> + struct delayed_work work; > >> > >> - unsigned long polling_jiffies; > >> unsigned long previous_freq; > >> - unsigned int next_polling; > >> > >> void *data; /* private data for governors */ > >> > >> - bool being_removed; > >> - > >> unsigned long min_freq; > >> unsigned long max_freq; > >> }; > >> -- > >> 1.7.11.3 > >> > >> > >> > >> > >> > >> > >> > >> > > > > -- > Regards, > Rajagopal > > > > > > >

11 years, 8 months

Re: [PATCH v2 3/3] devfreq: Add current freq callback in device profile

by MyungJoo Ham

> From: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> > > Devfreq returns governor predicted frequency as current frequency > via sysfs interface. But device may not support all frequencies > that governor predicts. So add a callback in device profile to get > current freq from driver. Also add a new sysfs node to expose > governor predicted next target frequency. > > Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> Signed-off-by: MyungJoo Ham <myungjoo.ham(a)samsung.com> > --- > Documentation/ABI/testing/sysfs-class-devfreq | 11 ++++++++++- > drivers/devfreq/devfreq.c | 14 ++++++++++++++ > include/linux/devfreq.h | 3 +++ > 3 files changed, 27 insertions(+), 1 deletion(-) > > diff --git a/Documentation/ABI/testing/sysfs-class-devfreq b/Documentation/ABI/testing/sysfs-class-devfreq > index 89283b1..e6cf08e 100644 > --- a/Documentation/ABI/testing/sysfs-class-devfreq > +++ b/Documentation/ABI/testing/sysfs-class-devfreq > @@ -19,7 +19,16 @@ Date: September 2011 > Contact: MyungJoo Ham <myungjoo.ham(a)samsung.com> > Description: > The /sys/class/devfreq/.../cur_freq shows the current > - frequency of the corresponding devfreq object. > + frequency of the corresponding devfreq object. Same as > + target_freq when get_cur_freq() is not implemented by > + devfreq driver. > + > +What: /sys/class/devfreq/.../target_freq > +Date: September 2012 > +Contact: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> > +Description: > + The /sys/class/devfreq/.../target_freq shows the next governor > + predicted target frequency of the corresponding devfreq object. > > What: /sys/class/devfreq/.../polling_interval > Date: September 2011 > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > index 309c46e..049e273 100644 > --- a/drivers/devfreq/devfreq.c > +++ b/drivers/devfreq/devfreq.c > @@ -401,6 +401,19 @@ static ssize_t show_governor(struct device *dev, > static ssize_t show_freq(struct device *dev, > struct device_attribute *attr, char *buf) > { > + unsigned long freq; > + struct devfreq *devfreq = to_devfreq(dev); > + > + if (devfreq->profile->get_cur_freq && > + !devfreq->profile->get_cur_freq(devfreq->dev.parent, &freq)) > + return sprintf(buf, "%lu\n", freq); > + > + return sprintf(buf, "%lu\n", devfreq->previous_freq); > +} > + > +static ssize_t show_target_freq(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > return sprintf(buf, "%lu\n", to_devfreq(dev)->previous_freq); > } > > @@ -504,6 +517,7 @@ static ssize_t show_max_freq(struct device *dev, struct device_attribute *attr, > static struct device_attribute devfreq_attrs[] = { > __ATTR(governor, S_IRUGO, show_governor, NULL), > __ATTR(cur_freq, S_IRUGO, show_freq, NULL), > + __ATTR(target_freq, S_IRUGO, show_target_freq, NULL), > __ATTR(polling_interval, S_IRUGO | S_IWUSR, show_polling_interval, > store_polling_interval), > __ATTR(min_freq, S_IRUGO | S_IWUSR, show_min_freq, store_min_freq), > diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h > index 7c7e179..d12ed41 100644 > --- a/include/linux/devfreq.h > +++ b/include/linux/devfreq.h > @@ -66,6 +66,8 @@ struct devfreq_dev_status { > * explained above with "DEVFREQ_FLAG_*" macros. > * @get_dev_status The device should provide the current performance > * status to devfreq, which is used by governors. > + * @get_cur_freq The device should provide the current frequency > + * at which it is operating. > * @exit An optional callback that is called when devfreq > * is removing the devfreq object due to error or > * from devfreq_remove_device() call. If the user > @@ -79,6 +81,7 @@ struct devfreq_dev_profile { > int (*target)(struct device *dev, unsigned long *freq, u32 flags); > int (*get_dev_status)(struct device *dev, > struct devfreq_dev_status *stat); > + int (*get_cur_freq)(struct device *dev, unsigned long *freq); > void (*exit)(struct device *dev); > }; > > -- > 1.7.11.3 > > > > > > > >

11 years, 8 months

[GIT PULL]: big LITTLE MP v8

by Viresh Kumar

Hi Andrey, This is PULL request for big LITTLE MP v8 branch: Major updates are: - Based on v3.6-rc5 - new branch from Paulm: rcu-hotplug-v1, vincent: scheduler-misc-v1 and sudeepk arm-multi_pmu_v1 - new version of patches from Morten: task-placement-v2 - config fragment updated for fast & slow cpu Compile tested only. -----------------------------------------x-------------------------x------------------------------- The following changes since commit 55d512e245bc7699a8800e23df1a24195dd08217: Linux 3.6-rc5 (2012-09-08 16:43:45 -0700) are available in the git repository at: git://git.linaro.org/arm/big.LITTLE/mp.git big-LITTLE-MP-v8 for you to fetch changes up to eb07c27e2987ab3c16cedee1367694988efe3ff4: Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'cpu-hotplug-get_online_cpus-v1', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v1', 'scheduler-misc-v1' and 'config-fragments' into big-LITTLE-MP-v8 (2012-09-17 09:26:07 +0530) ---------------------------------------------------------------- Axel Lin (1): ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c Ben Segall (1): sched: maintain per-rq runnable averages Jon Hunter (1): ARM: PMU: Add runtime PM Support Jon Medhurst (6): configs: Initial core configs configs: Make CONFIG_MODULES part of linaro-base Merge branch 'config-core-3.4' into config-core-tracking configs: Replace CONFIG_PERF_COUNTERS with CONFIG_PERF_EVENTS configs: android: Enable FB_EARLYSUSPEND configs: android: Enable CONFIG_INPUT_UINPUT to get aidb working Lorenzo Pieralisi (1): ARM: kernel: provide cluster to logical cpu mask mapping API Morten Rasmussen (10): sched: entity load-tracking load_avg_ratio sched: Task placement for heterogeneous systems based on task load-tracking sched: Forced task migration on heterogeneous systems sched: Introduce priority-based task migration filter ARM: Add HMP scheduling support for ARM architecture ARM: sched: Use device-tree to provide fast/slow CPU list for HMP ARM: sched: Setup SCHED_HMP domains sched: Add ftrace events for entity load-tracking sched: Add HMP task migration ftrace event sched: SCHED_HMP multi-domain task migration control Paul E. McKenney (4): rcu: Use smp_hotplug_thread facility for RCUs per-CPU kthread hotplug: Fix UP bug in smpboot hotplug code rcu: Remove _rcu_barrier() dependency on __stop_machine() rcu: Disallow callback registry on offline CPUs Paul Turner (15): sched: track the runnable average on a per-task entitiy basis sched: aggregate load contributed by task entities on parenting cfs_rq sched: maintain the load contribution of blocked entities sched: add an rq migration call-back to sched_class sched: account for blocked load waking back up sched: aggregate total task_group load sched: compute load contribution by a group entity sched: normalize tg load contributions against runnable time sched: maintain runnable averages across throttled periods sched: replace update_shares weight distribution with per-entity computation sched: refactor update_shares_cpu() -> update_blocked_avgs() sched: update_cfs_shares at period edge sched: make __update_entity_runnable_avg() fast sched: implement usage tracking sched: introduce temporary FAIR_GROUP_SCHED dependency for load-tracking Peter Zijlstra (1): sched: Fix load avg vs cpu-hotplug Ricardo Salveti de Araujo (8): configs: moving previous ubuntu.conf as ubuntu-minimal and creating a full ubuntu one configs: ubuntu: be compatible with the enforce script configs: ubuntu: disabling CODA_FS, seems to be broken atm configs: ubuntu: disabling CGROUPS as default Merge branch 'config-core-3.4' into config-core-tracking configs: ubuntu: updating configs for 3.5 configs: ubuntu: disabling CONFIG_MTD_NAND_NANDSIM=m, breaking build config: ubuntu: ATH6KL should be platform dependent Silas Boyd-Wickizer (6): Use get_online_cpus to avoid races involving CPU hotplug Use get_online_cpus to avoid races involving CPU hotplug Use get_online_cpus to avoid races involving CPU hotplug Use get_online_cpus to avoid races involving CPU hotplug Use get_online_cpus to avoid races involving CPU hotplug Use get_online_cpus to avoid races involving CPU hotplug Sudeep KarkadaNagesha (9): ARM: pmu: remove arm_pmu_type enumeration ARM: perf: move irq registration into pmu implementation ARM: perf: allocation of cpu_pmu at init time ARM: perf: change multiple arm_pmu function parameters to struct perf_event ARM: perf: rework on armv7_pmnc_counter_valid ARM: perf: define per-cpu arm_pmu instead of a single global pointer ARM: perf: register the init functions with the bindings ARM: perf: add support for per-cluster/multiple PMUs ARM: perf: save/restore pmu registers in pm notifier Thomas Gleixner (6): rcu: Yield simpler kthread: Implement park/unpark facility smpboot: Provide infrastructure for percpu hotplug threads softirq: Use hotplug thread infrastructure watchdog: Use hotplug thread infrastructure infiniband: ehca: Use hotplug thread infrastructure Vincent Guittot (2): sched: cpu_power: enable ARCH_POWER sched: Fix nohz_idle_balance() Viresh Kumar (4): configs: Add config fragments for big LITTLE MP linaro/configs: Update big LITTLE MP fragment for task placement work config-frag/big-LITTLE: Use device-tree to provide fast/slow CPU list for HMP Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'cpu-hotplug-get_online_cpus-v1', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v1', 'scheduler-misc-v1' and 'config-fragments' into big-LITTLE-MP-v8 Will Deacon (6): ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs ARM: pmu: remove unused reservation mechanism ARM: perf: remove mysterious compiler barrier ARM: perf: probe devicetree in preference to current CPU ARM: perf: prepare for moving CPU PMU code into separate file ARM: perf: move CPU-specific PMU handling code into separate file Documentation/devicetree/bindings/arm/pmu.txt | 7 + MAINTAINERS | 1 - arch/arm/Kconfig | 54 +- arch/arm/include/asm/perf_event.h | 9 +- arch/arm/include/asm/pmu.h | 128 +- arch/arm/include/asm/topology.h | 35 + arch/arm/kernel/Makefile | 4 +- arch/arm/kernel/perf_event.c | 391 +---- arch/arm/kernel/perf_event_cpu.c | 351 ++++ arch/arm/kernel/perf_event_v6.c | 152 +- arch/arm/kernel/perf_event_v7.c | 330 ++-- arch/arm/kernel/perf_event_xscale.c | 179 ++- arch/arm/kernel/pmu.c | 36 - arch/arm/kernel/topology.c | 118 ++ arch/arm/mach-bcmring/arch.c | 3 +- arch/arm/mach-omap2/devices.c | 3 +- arch/arm/mach-pxa/devices.c | 3 +- arch/arm/mach-realview/realview_eb.c | 3 +- arch/arm/mach-realview/realview_pb1176.c | 3 +- arch/arm/mach-realview/realview_pb11mp.c | 3 +- arch/arm/mach-realview/realview_pba8.c | 3 +- arch/arm/mach-realview/realview_pbx.c | 3 +- arch/arm/mach-tegra/devices.c | 3 +- arch/arm/mach-ux500/cpu-db8500.c | 4 +- arch/arm/mach-vexpress/ct-ca9x4.c | 3 +- arch/arm/plat-iop/pmu.c | 3 +- arch/arm/plat-samsung/devs.c | 3 +- arch/x86/kernel/cpuid.c | 5 + arch/x86/kernel/msr.c | 5 + drivers/hwmon/coretemp.c | 5 + drivers/hwmon/via-cputemp.c | 5 + drivers/infiniband/hw/ehca/ehca_irq.c | 253 ++- drivers/infiniband/hw/ehca/ehca_irq.h | 6 +- include/linux/kthread.h | 11 +- include/linux/sched.h | 34 + include/linux/smpboot.h | 43 + include/trace/events/sched.h | 153 ++ kernel/Makefile | 3 +- kernel/cpu.c | 10 +- kernel/kthread.c | 185 ++- kernel/rcutree.c | 105 +- kernel/rcutree.h | 18 +- kernel/rcutree_plugin.h | 403 +---- kernel/rcutree_trace.c | 7 +- kernel/sched/core.c | 56 +- kernel/sched/debug.c | 39 +- kernel/sched/fair.c | 1258 +++++++++++++-- kernel/sched/features.h | 2 +- kernel/sched/sched.h | 68 +- kernel/smpboot.c | 233 +++ kernel/smpboot.h | 4 + kernel/softirq.c | 108 +- kernel/watchdog.c | 263 ++- linaro/configs/android.conf | 33 + linaro/configs/big-LITTLE-MP.conf | 9 + linaro/configs/linaro-base.conf | 84 + linaro/configs/ubuntu-minimal.conf | 24 + linaro/configs/ubuntu.conf | 2133 +++++++++++++++++++++++++ 58 files changed, 5548 insertions(+), 1852 deletions(-) create mode 100644 arch/arm/kernel/perf_event_cpu.c delete mode 100644 arch/arm/kernel/pmu.c create mode 100644 include/linux/smpboot.h create mode 100644 linaro/configs/android.conf create mode 100644 linaro/configs/big-LITTLE-MP.conf create mode 100644 linaro/configs/linaro-base.conf create mode 100644 linaro/configs/ubuntu-minimal.conf create mode 100644 linaro/configs/ubuntu.conf

11 years, 8 months

General Invite Letter for Connect

by Zach Pfeffer

Hey everyone, I'm sending out general invites based on this for anyone who's looking for something to use or modify: Howdy y’all! This is Zach on the Linaro Android team with an invitation to our upcoming Linaro Connect event. Tired of carrying changes around on your internal trees? Looking to get some possibly disruptive changes changes into the Linux kernel, GCC or another upstream? Just want to chat and plan for the future of ARM open-source with developers who are passionate about the SoCs that run Android and other Linux based distributions? If you answered yes to any of these questions please join us for Linaro Connect in Copenhagen Oct 29th to Nov 2nd at the Bella Center. Feel free to email me at zach.pfeffer(a)linaro.org or G+ me for more information or to participate. Connect: http://connect.linaro.org/events/event/lce12-copenhagen/ Register at: http://connect.linaro.org/register-connect/ Be great to see you there! -- Zach Pfeffer Android Platform Team Lead, Linaro Platform Teams Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

11 years, 8 months

[Powertop][PATCH 1/2] Updates to support Android platform

by Rajagopal Venkat

This patch adds following minor changes to prepare powertop to support Android platform. - add missing HAVE_CONFIG_H conditional check. - remove un-used ethtool_cmd_speed_set and ethtool_cmd_speed functions. - minimize dependency on exception handling in catch blocks. These changes will not affect powertop functionality. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- src/devices/ahci.cpp | 4 ++-- src/devices/alsa.cpp | 4 ++-- src/devices/network.cpp | 16 ---------------- src/lib.cpp | 2 +- src/main.cpp | 2 ++ src/process/do_process.cpp | 4 ++-- 6 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/devices/ahci.cpp b/src/devices/ahci.cpp index 1fe39c7..67ce06e 100644 --- a/src/devices/ahci.cpp +++ b/src/devices/ahci.cpp @@ -170,7 +170,7 @@ void ahci::start_measurement(void) file.close(); } catch (std::ios_base::failure &c) { - fprintf(stderr, "%s\n", c.what()); + fprintf(stderr, "Failed to start measurement for ahci device\n"); } } @@ -203,7 +203,7 @@ void ahci::end_measurement(void) file.close(); } catch (std::ios_base::failure &c) { - fprintf(stderr, "%s\n", c.what()); + fprintf(stderr, "Failed to end measurement for ahci device\n"); } if (end_active < start_active) end_active = start_active; diff --git a/src/devices/alsa.cpp b/src/devices/alsa.cpp index 4f5d3f9..a67780c 100644 --- a/src/devices/alsa.cpp +++ b/src/devices/alsa.cpp @@ -104,7 +104,7 @@ void alsa::start_measurement(void) file.close(); } catch (std::ios_base::failure &c) { - fprintf(stderr, "%s\n", c.what()); + fprintf(stderr, "Failed to start measurement for alsa device\n"); } } @@ -130,7 +130,7 @@ void alsa::end_measurement(void) file.close(); } catch (std::ios_base::failure &c) { - fprintf(stderr, "%s\n", c.what()); + fprintf(stderr, "Failed to end measurement for alsa device\n"); } p = (end_active - start_active) / (0.001 + end_active + end_inactive - start_active - start_inactive) * 100.0; diff --git a/src/devices/network.cpp b/src/devices/network.cpp index b8a5c9c..ed9d7aa 100644 --- a/src/devices/network.cpp +++ b/src/devices/network.cpp @@ -55,22 +55,6 @@ extern "C" { static map<string, class network *> nics; -#ifdef DISABLE_TRYCATCH - -static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep, - __u32 speed) -{ - - ep->speed = (__u16)speed; - ep->speed_hi = (__u16)(speed >> 16); -} - -static inline __u32 ethtool_cmd_speed(struct ethtool_cmd *ep) -{ - return (ep->speed_hi << 16) | ep->speed; -} - -#endif static void do_proc_net_dev(void) { diff --git a/src/lib.cpp b/src/lib.cpp index 9838c0b..776a67b 100644 --- a/src/lib.cpp +++ b/src/lib.cpp @@ -259,7 +259,7 @@ void format_watts(double W, char *buffer, unsigned int len) if (W < 0.0001) sprintf(buffer, _(" 0 mW")); - while (mbstowcs(NULL,buffer,0) < len) + while (mbstowcs(NULL,buffer,len) < len) strcat(buffer, " "); } diff --git a/src/main.cpp b/src/main.cpp index 1815075..dc49dba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,7 +42,9 @@ #include "perf/perf.h" #include "perf/perf_bundle.h" #include "lib.h" +#ifdef HAVE_CONFIG_H #include "../config.h" +#endif #include "devices/device.h" diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp index eaef7f1..c9d6b0b 100644 --- a/src/process/do_process.cpp +++ b/src/process/do_process.cpp @@ -869,7 +869,7 @@ void process_update_display(void) if (!show_power) strcpy(power, " "); sprintf(name, "%s", all_power[i]->type()); - while (mbstowcs(NULL,name,0) < 14) strcat(name, " "); + while (mbstowcs(NULL,name,20) < 14) strcat(name, " "); if (all_power[i]->events() == 0 && all_power[i]->usage() == 0 && all_power[i]->Witts() == 0) @@ -882,7 +882,7 @@ void process_update_display(void) else sprintf(usage, "%5i%s", (int)all_power[i]->usage(), all_power[i]->usage_units()); } - while (mbstowcs(NULL,usage,0) < 14) strcat(usage, " "); + while (mbstowcs(NULL,usage,20) < 14) strcat(usage, " "); sprintf(events, "%5.1f", all_power[i]->events()); if (!all_power[i]->show_events()) events[0] = 0; -- 1.7.9.5

11 years, 8 months

First cut of a TCP/IP triggered NI battery simulator power measurement

by Zach Pfeffer

Video here: https://plus.google.com/u/0/104422661029399872488/posts/gKZxeTmEkMe This is cool because it lets us easily integrate the system into LAVA. -- Zach Pfeffer Android Platform Team Lead, Linaro Platform Teams Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

11 years, 8 months

[PATCH 1/3] acpi : move cpuidle_device field out of the acpi_processor_power structure

by Daniel Lezcano

Currently we have the cpuidle_device field in the acpi_processor_power structure. This adds a dependency between processor.h and cpuidle.h Although it is not a real problem, removing this dependency has the benefit of separating a bit more the cpuidle code from the rest of the acpi code. Also, the compilation should be a bit improved because we do no longer include cpuidle.h in processor.h. The preprocessor was generating 30418 loc and with this patch it generates 30256 loc for processor_thermal.c, a file which is not concerned at all by cpuidle, like processor_perflib.c and processor_throttling.c. That may sound ridiculous, but "small streams make big rivers" :P This patch moves this field into a static global per cpu variable like what is done in the intel_idle driver. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- drivers/acpi/processor_idle.c | 32 ++++++++++++++++++++++++-------- include/acpi/processor.h | 2 -- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index de89624..0a6405d 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -79,6 +79,8 @@ module_param(bm_check_disable, uint, 0000); static unsigned int latency_factor __read_mostly = 2; module_param(latency_factor, uint, 0644); +static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device); + static int disabled_by_idle_boot_param(void) { return boot_option_idle_override == IDLE_POLL || @@ -998,7 +1000,7 @@ static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr) int i, count = CPUIDLE_DRIVER_STATE_START; struct acpi_processor_cx *cx; struct cpuidle_state_usage *state_usage; - struct cpuidle_device *dev = &pr->power.dev; + struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id); if (!pr->flags.power_setup_done) return -EINVAL; @@ -1130,6 +1132,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) int acpi_processor_hotplug(struct acpi_processor *pr) { int ret = 0; + struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id); if (disabled_by_idle_boot_param()) return 0; @@ -1145,11 +1148,11 @@ int acpi_processor_hotplug(struct acpi_processor *pr) return -ENODEV; cpuidle_pause_and_lock(); - cpuidle_disable_device(&pr->power.dev); + cpuidle_disable_device(dev); acpi_processor_get_power_info(pr); if (pr->flags.power) { acpi_processor_setup_cpuidle_cx(pr); - ret = cpuidle_enable_device(&pr->power.dev); + ret = cpuidle_enable_device(dev); } cpuidle_resume_and_unlock(); @@ -1160,6 +1163,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) { int cpu; struct acpi_processor *_pr; + struct cpuidle_device *dev; if (disabled_by_idle_boot_param()) return 0; @@ -1190,7 +1194,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) _pr = per_cpu(processors, cpu); if (!_pr || !_pr->flags.power_setup_done) continue; - cpuidle_disable_device(&_pr->power.dev); + dev = per_cpu(acpi_cpuidle_device, cpu); + cpuidle_disable_device(dev); } /* Populate Updated C-state information */ @@ -1204,7 +1209,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) acpi_processor_get_power_info(_pr); if (_pr->flags.power) { acpi_processor_setup_cpuidle_cx(_pr); - cpuidle_enable_device(&_pr->power.dev); + dev = per_cpu(acpi_cpuidle_device, cpu); + cpuidle_enable_device(dev); } } put_online_cpus(); @@ -1221,6 +1227,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, { acpi_status status = 0; int retval; + struct cpuidle_device *dev; static int first_run; if (disabled_by_idle_boot_param()) @@ -1266,11 +1273,18 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n", acpi_idle_driver.name); } + + dev = kzalloc(sizeof(*dev), GFP_KERNEL); + if (!dev) + return -ENOMEM; + per_cpu(acpi_cpuidle_device, pr->id) = dev; + + acpi_processor_setup_cpuidle_cx(pr); + /* Register per-cpu cpuidle_device. Cpuidle driver * must already be registered before registering device */ - acpi_processor_setup_cpuidle_cx(pr); - retval = cpuidle_register_device(&pr->power.dev); + retval = cpuidle_register_device(dev); if (retval) { if (acpi_processor_registered == 0) cpuidle_unregister_driver(&acpi_idle_driver); @@ -1284,11 +1298,13 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, int acpi_processor_power_exit(struct acpi_processor *pr, struct acpi_device *device) { + struct cpuidle_device *dev = per_cpu(acpi_cpuidle_device, pr->id); + if (disabled_by_idle_boot_param()) return 0; if (pr->flags.power) { - cpuidle_unregister_device(&pr->power.dev); + cpuidle_unregister_device(dev); acpi_processor_registered--; if (acpi_processor_registered == 0) cpuidle_unregister_driver(&acpi_idle_driver); diff --git a/include/acpi/processor.h b/include/acpi/processor.h index db427fa..ddd1a44 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -3,7 +3,6 @@ #include <linux/kernel.h> #include <linux/cpu.h> -#include <linux/cpuidle.h> #include <linux/thermal.h> #include <asm/acpi.h> @@ -64,7 +63,6 @@ struct acpi_processor_cx { }; struct acpi_processor_power { - struct cpuidle_device dev; struct acpi_processor_cx *state; unsigned long bm_check_timestamp; u32 default_state; -- 1.7.5.4

11 years, 8 months

mfd: Implement devicetree support for AB8500 Btemp

by Rajanikanth HV

This patch adds device tree support for battery temperature monitor driver Signed-off-by: Rajanikanth H.V <rajanikanth.hv(a)stericsson.com> --- .../bindings/power_supply/ab8500/btemp.txt | 52 ++++++ arch/arm/boot/dts/dbx5x0.dtsi | 8 + drivers/mfd/ab8500-core.c | 1 + drivers/power/Kconfig | 6 - drivers/power/ab8500_bmdata.h | 4 +- drivers/power/ab8500_btemp.c | 181 ++++++++++++++++---- 6 files changed, 213 insertions(+), 39 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt diff --git a/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt b/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt new file mode 100644 index 0000000..b214efc --- /dev/null +++ b/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt @@ -0,0 +1,52 @@ +=== AB8500 Battery Temperature Monitor Driver === + +The properties below describes the node for battery +temperature monitor driver. + +Required Properties: +- compatible = "stericsson,ab8500-btemp" + +supplied-to: + This is a logical binding w.r.t power supply event change + across energy-management-module drivers where in the + runtime battery properties are shared along with uevent + notification. + ref: di->btemp_psy.external_power_changed = + ab8500_btemp_external_power_changed; + ab8500_btemp.c + + Need for this property: + btemp, fg and charger updates power-supply properties + based on the events listed above. + Event handler invokes power supply change notifier + which in-turn invokes registered power supply class call-back + based on the 'supplied_to' string. + ref: + power_supply_changed_work(..) ./drivers/power/power_supply_core.c + + example: + ab8500-btemp { + /* Other enery management module */ + supplied-to = "ab8500_chargalg", "ab8500_fg"; + num_supplicants = <2>; + }; + +thermister-interface: + 'btemp' and 'batctrl' are the pins interfaced for battery temperature + measurement, btemp is used when NTC(negative temperature coefficient) + resister is interfaced external to battery and batctrl is used when + NTC resister is internal to battery. + + +li-ion-9100-battery: + use this to add support for the 9100 Li-ION battery, + this adjust the bkup battery charger parameters + Note: this property is used for tablet version of snowball board. + + example: + ab8500-btemp { + thermister-internal-to-battery = <1>; + li_ion_9100_battery = <0>; + }; +Note: +interrupts are defined and registered in the driver diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index d69c087..643e7fd 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -360,6 +360,14 @@ li_ion_9100 = <0>; }; + ab8500-btemp { + compatible = "stericsson,ab8500-btemp"; + supplied_to = "ab8500_chargalg", "ab8500_fg"; + num_supplicants = <2>; + thermister_on_batctrl = <1>; + li_ion_9100 = <0>; + }; + ab8500-usb { compatible = "stericsson,ab8500-usb"; interrupts = < 90 0x4 diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index c413cfa..7ffba9b 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -1047,6 +1047,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = { }, { .name = "ab8500-btemp", + .of_compatible = "stericsson,ab8500-btemp", .num_resources = ARRAY_SIZE(ab8500_btemp_resources), .resources = ab8500_btemp_resources, }, diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index c1892f3..1434871 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -304,12 +304,6 @@ config AB8500_BM help Say Y to include support for AB8500 battery management. -config AB8500_BATTERY_THERM_ON_BATCTRL - bool "Thermistor connected on BATCTRL ADC" - depends on AB8500_BM - help - Say Y to enable battery temperature measurements using - thermistor connected on BATCTRL ADC. endif # POWER_SUPPLY source "drivers/power/avs/Kconfig" diff --git a/drivers/power/ab8500_bmdata.h b/drivers/power/ab8500_bmdata.h index 748334a..0bd0a45 100644 --- a/drivers/power/ab8500_bmdata.h +++ b/drivers/power/ab8500_bmdata.h @@ -22,7 +22,7 @@ static struct abx500_res_to_temp temp_tbl_A_thermister[] = { {65, 12500}, }; static struct abx500_res_to_temp temp_tbl_B_thermister[] = { - {-5, 165418}, + {-5, 200000}, { 0, 159024}, { 5, 151921}, {10, 144300}, @@ -229,7 +229,7 @@ static struct abx500_battery_type bat_type_thermister[] = { }, { .name = POWER_SUPPLY_TECHNOLOGY_LIPO, - .resis_high = 165418, + .resis_high = 200000, .resis_low = 82869, .battery_resistance = 300, .charge_full_design = 900, diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c index bba3cca..ac08f1a 100644 --- a/drivers/power/ab8500_btemp.c +++ b/drivers/power/ab8500_btemp.c @@ -16,6 +16,7 @@ #include <linux/interrupt.h> #include <linux/delay.h> #include <linux/slab.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/completion.h> @@ -25,6 +26,7 @@ #include <linux/mfd/abx500/ab8500-bm.h> #include <linux/mfd/abx500/ab8500-gpadc.h> #include <linux/jiffies.h> +#include "ab8500_bmdata.h" #define VTVOUT_V 1800 @@ -960,42 +962,153 @@ static int __devexit ab8500_btemp_remove(struct platform_device *pdev) return 0; } -static int __devinit ab8500_btemp_probe(struct platform_device *pdev) +static int __devinit +btemp_of_probe(struct device *dev, + struct device_node *np, + struct abx500_bm_plat_data *bm_pdata) { - int irq, i, ret = 0; - u8 val; - struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data; - struct ab8500_btemp *di; - - if (!plat_data) { - dev_err(&pdev->dev, "No platform data\n"); - return -EINVAL; + u8 val; + u32 pval; + int i; + int ext_thermister, lion_battery, ret = 0; + const char *bm_dev_name; + struct abx500_btemp_platform_data *btemp = bm_pdata->btemp; + struct abx500_bm_data *bat; + struct abx500_battery_type *btype; + + ret = of_property_read_u32(np, "num_supplicants", &pval); + if (ret) { + dev_err(dev, "missing property num_supplicants\n"); + ret = -EINVAL; + goto inval_pval; } - - di = kzalloc(sizeof(*di), GFP_KERNEL); - if (!di) - return -ENOMEM; - - /* get parent data */ - di->dev = &pdev->dev; - di->parent = dev_get_drvdata(pdev->dev.parent); - di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); - - /* get btemp specific platform data */ - di->pdata = plat_data->btemp; - if (!di->pdata) { - dev_err(di->dev, "no btemp platform data supplied\n"); + btemp->num_supplicants = pval; + btemp->supplied_to = + devm_kzalloc(dev, btemp->num_supplicants * + sizeof(const char *), GFP_KERNEL); + if (btemp->supplied_to == NULL) { + dev_err(dev, "%s no mem for supplied_to\n", __func__); + ret = -ENOMEM; + goto inval_pval; + } + for (val = 0; val < btemp->num_supplicants; ++val) + if (of_property_read_string_index + (np, "supplied_to", val, &bm_dev_name) == 0) + *(btemp->supplied_to + val) = (char *)bm_dev_name; + else { + dev_err(dev, "insufficient number of supplied_to data found\n"); + ret = -EINVAL; + goto free_dev_mem; + } + ret = of_property_read_u32(np, "thermister_on_batctrl", &pval); + if (ret) { + dev_err(dev, "missing property thermister_on_batctrl\n"); ret = -EINVAL; - goto free_device_info; + goto free_dev_mem; + } + bm_pdata->battery = &ab8500_bm_data; + bat = bm_pdata->battery; + ext_thermister = 0; + if (pval == 0) { + bat->n_btypes = 4; + bat->bat_type = bat_type_ext_thermister; + bat->adc_therm = ABx500_ADC_THERM_BATTEMP; + ext_thermister = 1; + } + ret = of_property_read_u32(np, "li_ion_9100", &pval); + if (ret) { + dev_err(dev, "missing property li_ion_9100\n"); + ret = -EINVAL; + goto free_dev_mem; + } + lion_battery = 0; + if (pval == 1) { + bat->no_maintenance = true; + bat->chg_unknown_bat = true; + bat->bat_type[BATTERY_UNKNOWN].charge_full_design = 2600; + bat->bat_type[BATTERY_UNKNOWN].termination_vol = 4150; + bat->bat_type[BATTERY_UNKNOWN].recharge_vol = 4130; + bat->bat_type[BATTERY_UNKNOWN].normal_cur_lvl = 520; + bat->bat_type[BATTERY_UNKNOWN].normal_vol_lvl = 4200; + lion_battery = 1; + } + /* select the battery resolution table */ + for (i = 0; i < bat->n_btypes; ++i) { + btype = (bat->bat_type + i); + if (ext_thermister) { + btype->batres_tbl = + temp_to_batres_tbl_ext_thermister; + } else if (lion_battery) { + btype->batres_tbl = + temp_to_batres_tbl_9100; + } else { + btype->batres_tbl = + temp_to_batres_tbl_thermister; + } + } + return ret; +free_dev_mem: + devm_kfree(dev, btemp->supplied_to); +inval_pval: + return ret; +} + +static int __devinit ab8500_btemp_probe(struct platform_device *pdev) +{ + u8 val; + int i; + int irq, ret = 0; + struct abx500_bm_plat_data *pdata = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; + struct ab8500_btemp *di; + + di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); + if (!di) { + dev_err(&pdev->dev, "%s no mem for ab8500_btemp\n", __func__); + ret = -ENOMEM; } - /* get battery specific platform data */ - di->bat = plat_data->battery; - if (!di->bat) { - dev_err(di->dev, "no battery platform data supplied\n"); + if (np) { + if (!pdata) { + pdata = + devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + dev_err(&pdev->dev, + "%s no mem for pdata\n", __func__); + ret = -ENOMEM; + goto err_no_mem; + } + pdata->btemp = devm_kzalloc(&pdev->dev, + sizeof(*pdata->btemp), GFP_KERNEL); + if (!pdata->btemp) { + devm_kfree(&pdev->dev, pdata); + dev_err(&pdev->dev, + "%s no mem for pdata->btemp\n", + __func__); + ret = -ENOMEM; + goto free_device_info; + } + } + /* get battery specific platform data */ + ret = btemp_of_probe(&pdev->dev, np, pdata); + if (ret) { + devm_kfree(&pdev->dev, pdata->btemp); + devm_kfree(&pdev->dev, pdata); + goto free_device_info; + } + } + if (!pdata) { + dev_err(&pdev->dev, + "%s no btemp platform data found\n", __func__); ret = -EINVAL; goto free_device_info; } + di->pdata = pdata->btemp; + di->bat = pdata->battery; + /* get parent data */ + di->dev = &pdev->dev; + di->parent = dev_get_drvdata(pdev->dev.parent); + di->gpadc = ab8500_gpadc_get("ab8500-gpadc.0"); /* BTEMP supply */ di->btemp_psy.name = "ab8500_btemp"; @@ -1008,7 +1121,6 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev) di->btemp_psy.external_power_changed = ab8500_btemp_external_power_changed; - /* Create a work queue for the btemp */ di->btemp_wq = create_singlethread_workqueue("ab8500_btemp_wq"); @@ -1065,7 +1177,7 @@ static int __devinit ab8500_btemp_probe(struct platform_device *pdev) IRQF_SHARED | IRQF_NO_SUSPEND, ab8500_btemp_irq[i].name, di); - if (ret) { + if (ret < 0) { dev_err(di->dev, "failed to request %s IRQ %d: %d\n" , ab8500_btemp_irq[i].name, irq, ret); goto free_irq; @@ -1093,11 +1205,17 @@ free_irq: free_btemp_wq: destroy_workqueue(di->btemp_wq); free_device_info: - kfree(di); + devm_kfree(&pdev->dev, di); +err_no_mem: return ret; } +static const struct of_device_id ab8500_btemp_match[] = { + {.compatible = "stericsson,ab8500-btemp",}, + {}, +}; + static struct platform_driver ab8500_btemp_driver = { .probe = ab8500_btemp_probe, .remove = __devexit_p(ab8500_btemp_remove), @@ -1106,6 +1224,7 @@ static struct platform_driver ab8500_btemp_driver = { .driver = { .name = "ab8500-btemp", .owner = THIS_MODULE, + .of_match_table = ab8500_btemp_match, }, }; -- 1.7.9.5

11 years, 8 months

[PATCH] mfd: Implement devicetree support for AB8500 fg

by Rajanikanth HV

This patch adds device tree support for fuel guage driver Signed-off-by: Rajanikanth H.V <rajanikanth.hv(a)stericsson.com> --- Documentation/devicetree/bindings/mfd/ab8500.txt | 8 +- .../devicetree/bindings/power_supply/ab8500/fg.txt | 61 +++ arch/arm/boot/dts/dbx5x0.dtsi | 8 + drivers/mfd/ab8500-core.c | 1 + drivers/power/Makefile | 2 +- drivers/power/ab8500_bmdata.h | 442 ++++++++++++++++++++ drivers/power/ab8500_fg.c | 148 ++++++- include/linux/mfd/abx500.h | 2 +- 8 files changed, 664 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/fg.txt create mode 100644 drivers/power/ab8500_bmdata.h diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt index ce83c8d..762dc11 100644 --- a/Documentation/devicetree/bindings/mfd/ab8500.txt +++ b/Documentation/devicetree/bindings/mfd/ab8500.txt @@ -24,7 +24,13 @@ ab8500-bm : : : Battery Manager ab8500-btemp : : : Battery Temperature ab8500-charger : : : Battery Charger ab8500-codec : : : Audio Codec -ab8500-fg : : : Fuel Gauge +ab8500-fg : : vddadc : Fuel Gauge + : NCONV_ACCU : : Accumulate N Sample Conversion + : BATT_OVV : : Battery Over Voltage + : LOW_BAT_F : : LOW threshold battery voltage + : CC_INT_CALIB : : Counter Counter Internal Calibration + : CCEOC : : Coulomb Counter End of Conversion + : : : ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter SW_CONV_END : : ab8500-gpio : : : GPIO Controller diff --git a/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt b/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt new file mode 100644 index 0000000..c2c122e --- /dev/null +++ b/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt @@ -0,0 +1,61 @@ +=== AB8500 Fuel Gauge Driver === + +AB8500 is a mixed signal multimedia and power management +device comprising: power and energy-management-module, +wall-charger, usb-charger, audio codec, general purpose adc, +tvout, clock management and sim card interface. + +Fuel-guage support is part of energy-management-module, the other +components of this module are: +main-charger, usb-combo-charger and Battery temperature monitoring. + +The properties below describes the node for fuel guage driver. + +Required Properties: +- compatible = "stericsson,ab8500-fg" + +supplied-to: + This is a logical binding w.r.t power supply event change + across energy-management-module drivers where in the + runtime battery properties are shared along with uevent + notification. + ref: di->fg.external_power_changed = + ab8500_fg_external_power_changed; + ab8500_fg.c + + Need for this property: + btemp, fg and charger updates power-supply properties + based on the events listed above. + Event handler invokes power supply change notifier + which in-turn invokes registered power supply class call-back + based on the 'supplied_to' string. + ref: + power_supply_changed_work(..) ./drivers/power/power_supply_core.c + + example: + ab8500-fg { + /* Other enery management module */ + supplied_to = "ab8500_chargalg", "ab8500_usb"; + num_supplicants = <2>; + }; + +thermister-interface: + 'btemp' and 'batctrl' are the pins interfaced for battery temperature + measurement, btemp is used when NTC(negative temperature coefficient) + resister is interfaced external to battery and batctrl is used when + NTC resister is internal to battery. + + +li-ion-9100-battery: + use this to add support for the 9100 Li-ION battery, + this adjust the bkup battery charger parameters + Note: this property is used for tablet version of snowball board. + + example: + ab8500-fg { + thermister-internal-to-battery = <1>; + li_ion_9100_battery = <0>; + }; +Note: +interrupts are defined and registered in the driver + diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 7d84f46..d69c087 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -352,6 +352,14 @@ vddadc-supply = <&ab8500_ldo_tvout_reg>; }; + ab8500-fg { + compatible = "stericsson,ab8500-fg"; + supplied_to = "ab8500_chargalg", "ab8500_usb"; + num_supplicants = <2>; + thermister_on_batctrl = <1>; + li_ion_9100 = <0>; + }; + ab8500-usb { compatible = "stericsson,ab8500-usb"; interrupts = < 90 0x4 diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index 71a7757..c413cfa 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -1052,6 +1052,7 @@ static struct mfd_cell __devinitdata ab8500_bm_devs[] = { }, { .name = "ab8500-fg", + .of_compatible = "stericsson,ab8500-fg", .num_resources = ARRAY_SIZE(ab8500_fg_resources), .resources = ab8500_fg_resources, }, diff --git a/drivers/power/Makefile b/drivers/power/Makefile index ee58afb..ed73e11 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o -obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_btemp.o ab8500_fg.o abx500_chargalg.o +obj-$(CONFIG_AB8500_BM) += ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o obj-$(CONFIG_CHARGER_MAX8903) += max8903_charger.o obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o diff --git a/drivers/power/ab8500_bmdata.h b/drivers/power/ab8500_bmdata.h new file mode 100644 index 0000000..748334a --- /dev/null +++ b/drivers/power/ab8500_bmdata.h @@ -0,0 +1,442 @@ +/* + * These are the defined batteries that uses a NTC and ID resistor placed + * inside of the battery pack. + * Note that the res_to_temp table must be strictly sorted by falling resistance + * values to work. + */ +static struct abx500_res_to_temp temp_tbl_A_thermister[] = { + {-5, 53407}, + { 0, 48594}, + { 5, 43804}, + {10, 39188}, + {15, 34870}, + {20, 30933}, + {25, 27422}, + {30, 24347}, + {35, 21694}, + {40, 19431}, + {45, 17517}, + {50, 15908}, + {55, 14561}, + {60, 13437}, + {65, 12500}, +}; +static struct abx500_res_to_temp temp_tbl_B_thermister[] = { + {-5, 165418}, + { 0, 159024}, + { 5, 151921}, + {10, 144300}, + {15, 136424}, + {20, 128565}, + {25, 120978}, + {30, 113875}, + {35, 107397}, + {40, 101629}, + {45, 96592}, + {50, 92253}, + {55, 88569}, + {60, 85461}, + {65, 82869}, +}; +static struct abx500_v_to_cap cap_tbl_A_thermister[] = { + {4171, 100}, + {4114, 95}, + {4009, 83}, + {3947, 74}, + {3907, 67}, + {3863, 59}, + {3830, 56}, + {3813, 53}, + {3791, 46}, + {3771, 33}, + {3754, 25}, + {3735, 20}, + {3717, 17}, + {3681, 13}, + {3664, 8}, + {3651, 6}, + {3635, 5}, + {3560, 3}, + {3408, 1}, + {3247, 0}, +}; +static struct abx500_v_to_cap cap_tbl_B_thermister[] = { + {4161, 100}, + {4124, 98}, + {4044, 90}, + {4003, 85}, + {3966, 80}, + {3933, 75}, + {3888, 67}, + {3849, 60}, + {3813, 55}, + {3787, 47}, + {3772, 30}, + {3751, 25}, + {3718, 20}, + {3681, 16}, + {3660, 14}, + {3589, 10}, + {3546, 7}, + {3495, 4}, + {3404, 2}, + {3250, 0}, +}; + +static struct abx500_v_to_cap cap_tbl[] = { + {4186, 100}, + {4163, 99}, + {4114, 95}, + {4068, 90}, + {3990, 80}, + {3926, 70}, + {3898, 65}, + {3866, 60}, + {3833, 55}, + {3812, 50}, + {3787, 40}, + {3768, 30}, + {3747, 25}, + {3730, 20}, + {3705, 15}, + {3699, 14}, + {3684, 12}, + {3672, 9}, + {3657, 7}, + {3638, 6}, + {3556, 4}, + {3424, 2}, + {3317, 1}, + {3094, 0}, +}; + +/* + * Note that the res_to_temp table must be strictly sorted by falling + * resistance values to work. + */ +static struct abx500_res_to_temp temp_tbl[] = { + {-5, 214834}, + { 0, 162943}, + { 5, 124820}, + {10, 96520}, + {15, 75306}, + {20, 59254}, + {25, 47000}, + {30, 37566}, + {35, 30245}, + {40, 24520}, + {45, 20010}, + {50, 16432}, + {55, 13576}, + {60, 11280}, + {65, 9425}, +}; + +/* + * Note that the batres_vs_temp table must be strictly sorted by falling + * temperature values to work. + */ +static struct batres_vs_temp temp_to_batres_tbl_thermister[] = { + { 40, 120}, + { 30, 135}, + { 20, 165}, + { 10, 230}, + { 00, 325}, + {-10, 445}, + {-20, 595}, +}; + +/* + * Note that the batres_vs_temp table must be strictly sorted by falling + * temperature values to work. + */ +static struct batres_vs_temp temp_to_batres_tbl_ext_thermister[] = { + { 60, 300}, + { 30, 300}, + { 20, 300}, + { 10, 300}, + { 00, 300}, + {-10, 300}, + {-20, 300}, +}; +/* battery resistance table for LI ION 9100 battery */ +static struct batres_vs_temp temp_to_batres_tbl_9100[] = { + { 60, 180}, + { 30, 180}, + { 20, 180}, + { 10, 180}, + { 00, 180}, + {-10, 180}, + {-20, 180}, +}; + +static struct abx500_battery_type bat_type_thermister[] = { +[BATTERY_UNKNOWN] = { + /* First element always represent the UNKNOWN battery */ + .name = POWER_SUPPLY_TECHNOLOGY_UNKNOWN, + .resis_high = 0, + .resis_low = 0, + .battery_resistance = 300, + .charge_full_design = 612, + .nominal_voltage = 3700, + .termination_vol = 4050, + .termination_curr = 200, + .recharge_vol = 3990, + .normal_cur_lvl = 400, + .normal_vol_lvl = 4100, + .maint_a_cur_lvl = 400, + .maint_a_vol_lvl = 4050, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 400, + .maint_b_vol_lvl = 4000, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl), + .r_to_t_tbl = temp_tbl, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl), + .v_to_cap_tbl = cap_tbl, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +{ + .name = POWER_SUPPLY_TECHNOLOGY_LIPO, + .resis_high = 53407, + .resis_low = 12500, + .battery_resistance = 300, + .charge_full_design = 900, + .nominal_voltage = 3600, + .termination_vol = 4150, + .termination_curr = 80, + .recharge_vol = 4130, + .normal_cur_lvl = 700, + .normal_vol_lvl = 4200, + .maint_a_cur_lvl = 600, + .maint_a_vol_lvl = 4150, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 600, + .maint_b_vol_lvl = 4100, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl_A_thermister), + .r_to_t_tbl = temp_tbl_A_thermister, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl_A_thermister), + .v_to_cap_tbl = cap_tbl_A_thermister, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, + +}, +{ + .name = POWER_SUPPLY_TECHNOLOGY_LIPO, + .resis_high = 165418, + .resis_low = 82869, + .battery_resistance = 300, + .charge_full_design = 900, + .nominal_voltage = 3600, + .termination_vol = 4150, + .termination_curr = 80, + .recharge_vol = 4130, + .normal_cur_lvl = 700, + .normal_vol_lvl = 4200, + .maint_a_cur_lvl = 600, + .maint_a_vol_lvl = 4150, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 600, + .maint_b_vol_lvl = 4100, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl_B_thermister), + .r_to_t_tbl = temp_tbl_B_thermister, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl_B_thermister), + .v_to_cap_tbl = cap_tbl_B_thermister, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +}; + +static struct abx500_battery_type bat_type_ext_thermister[] = { +[BATTERY_UNKNOWN] = { + /* First element always represent the UNKNOWN battery */ + .name = POWER_SUPPLY_TECHNOLOGY_UNKNOWN, + .resis_high = 0, + .resis_low = 0, + .battery_resistance = 300, + .charge_full_design = 612, + .nominal_voltage = 3700, + .termination_vol = 4050, + .termination_curr = 200, + .recharge_vol = 3990, + .normal_cur_lvl = 400, + .normal_vol_lvl = 4100, + .maint_a_cur_lvl = 400, + .maint_a_vol_lvl = 4050, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 400, + .maint_b_vol_lvl = 4000, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl), + .r_to_t_tbl = temp_tbl, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl), + .v_to_cap_tbl = cap_tbl, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +/* + * These are the batteries that doesn't have an internal NTC resistor to measure + * its temperature. The temperature in this case is measure with a NTC placed + * near the battery but on the PCB. + */ +{ + .name = POWER_SUPPLY_TECHNOLOGY_LIPO, + .resis_high = 76000, + .resis_low = 53000, + .battery_resistance = 300, + .charge_full_design = 900, + .nominal_voltage = 3700, + .termination_vol = 4150, + .termination_curr = 100, + .recharge_vol = 4130, + .normal_cur_lvl = 700, + .normal_vol_lvl = 4200, + .maint_a_cur_lvl = 600, + .maint_a_vol_lvl = 4150, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 600, + .maint_b_vol_lvl = 4100, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl), + .r_to_t_tbl = temp_tbl, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl), + .v_to_cap_tbl = cap_tbl, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +{ + .name = POWER_SUPPLY_TECHNOLOGY_LION, + .resis_high = 30000, + .resis_low = 10000, + .battery_resistance = 300, + .charge_full_design = 950, + .nominal_voltage = 3700, + .termination_vol = 4150, + .termination_curr = 100, + .recharge_vol = 4130, + .normal_cur_lvl = 700, + .normal_vol_lvl = 4200, + .maint_a_cur_lvl = 600, + .maint_a_vol_lvl = 4150, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 600, + .maint_b_vol_lvl = 4100, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl), + .r_to_t_tbl = temp_tbl, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl), + .v_to_cap_tbl = cap_tbl, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +{ + .name = POWER_SUPPLY_TECHNOLOGY_LION, + .resis_high = 95000, + .resis_low = 76001, + .battery_resistance = 300, + .charge_full_design = 950, + .nominal_voltage = 3700, + .termination_vol = 4150, + .termination_curr = 100, + .recharge_vol = 4130, + .normal_cur_lvl = 700, + .normal_vol_lvl = 4200, + .maint_a_cur_lvl = 600, + .maint_a_vol_lvl = 4150, + .maint_a_chg_timer_h = 60, + .maint_b_cur_lvl = 600, + .maint_b_vol_lvl = 4100, + .maint_b_chg_timer_h = 200, + .low_high_cur_lvl = 300, + .low_high_vol_lvl = 4000, + .n_temp_tbl_elements = ARRAY_SIZE(temp_tbl), + .r_to_t_tbl = temp_tbl, + .n_v_cap_tbl_elements = ARRAY_SIZE(cap_tbl), + .v_to_cap_tbl = cap_tbl, + .n_batres_tbl_elements = ARRAY_SIZE(temp_to_batres_tbl_thermister), + .batres_tbl = temp_to_batres_tbl_thermister, +}, +}; + +static const struct abx500_bm_capacity_levels cap_levels = { + .critical = 2, + .low = 10, + .normal = 70, + .high = 95, + .full = 100, +}; + +static const struct abx500_fg_parameters fg = { + .recovery_sleep_timer = 10, + .recovery_total_time = 100, + .init_timer = 1, + .init_discard_time = 5, + .init_total_time = 40, + .high_curr_time = 60, + .accu_charging = 30, + .accu_high_curr = 30, + .high_curr_threshold = 50, + .lowbat_threshold = 3100, + .battok_falling_th_sel0 = 2860, + .battok_raising_th_sel1 = 2860, + .user_cap_limit = 15, + .maint_thres = 97, +}; + +static const struct abx500_maxim_parameters maxi_params = { + .ena_maxi = true, + .chg_curr = 910, + .wait_cycles = 10, + .charger_curr_step = 100, +}; + +static const struct abx500_bm_charger_parameters chg = { + .usb_volt_max = 5500, + .usb_curr_max = 1500, + .ac_volt_max = 7500, + .ac_curr_max = 1500, +}; + +static struct abx500_bm_data ab8500_bm_data = { + .temp_under = 3, + .temp_low = 8, + .temp_high = 43, + .temp_over = 48, + .main_safety_tmr_h = 4, + .temp_interval_chg = 20, + .temp_interval_nochg = 120, + .usb_safety_tmr_h = 4, + .bkup_bat_v = BUP_VCH_SEL_2P6V, + .bkup_bat_i = BUP_ICH_SEL_150UA, + .no_maintenance = false, + .adc_therm = ABx500_ADC_THERM_BATCTRL, + .chg_unknown_bat = false, + .enable_overshoot = false, + .fg_res = 100, + .cap_levels = &cap_levels, + .bat_type = bat_type_thermister, + .n_btypes = 3, + .batt_id = 0, + .interval_charging = 5, + .interval_not_charging = 120, + .temp_hysteresis = 3, + .gnd_lift_resistance = 34, + .maxi = &maxi_params, + .chg_params = &chg, + .fg_params = &fg, +}; diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index bf02225..4984dc8 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -25,12 +25,14 @@ #include <linux/mfd/abx500/ab8500.h> #include <linux/mfd/abx500.h> #include <linux/slab.h> +#include <linux/of.h> #include <linux/mfd/abx500/ab8500-bm.h> #include <linux/delay.h> #include <linux/mfd/abx500/ab8500-gpadc.h> #include <linux/mfd/abx500.h> #include <linux/time.h> #include <linux/completion.h> +#include "ab8500_bmdata.h" #define MILLI_TO_MICRO 1000 #define FG_LSB_IN_MA 1627 @@ -544,14 +546,14 @@ cc_err: ret = abx500_set_register_interruptible(di->dev, AB8500_GAS_GAUGE, AB8500_GASG_CC_NCOV_ACCU, SEC_TO_SAMPLE(10)); - if (ret) + if (ret < 0) goto fail; /* Start the CC */ ret = abx500_set_register_interruptible(di->dev, AB8500_RTC, AB8500_RTC_CC_CONF_REG, (CC_DEEP_SLEEP_ENA | CC_PWR_UP_ENA)); - if (ret) + if (ret < 0) goto fail; } else { di->turn_off_fg = false; @@ -2442,16 +2444,145 @@ static struct ab8500_fg_interrupts ab8500_fg_irq[] = { {"CCEOC", ab8500_fg_cc_data_end_handler}, }; +static int __devinit +fg_of_probe(struct device *dev, + struct device_node *np, + struct abx500_bm_plat_data *bm_pdata) +{ + u8 val; + u32 pval; + int i; + int ext_thermister, lion_battery, ret = 0; + const char *bm_dev_name; + struct abx500_fg_platform_data *fg = bm_pdata->fg; + struct abx500_bm_data *bat; + struct abx500_battery_type *btype; + + ret = of_property_read_u32(np, "num_supplicants", &pval); + if (ret) { + dev_err(dev, "missing property num_supplicants\n"); + ret = -EINVAL; + goto inval_pval; + } + fg->num_supplicants = pval; + fg->supplied_to = + devm_kzalloc(dev, fg->num_supplicants * + sizeof(const char *), GFP_KERNEL); + if (fg->supplied_to == NULL) { + dev_err(dev, "%s no mem for supplied_to\n", __func__); + ret = -ENOMEM; + goto inval_pval; + } + for (val = 0; val < fg->num_supplicants; ++val) + if (of_property_read_string_index + (np, "supplied_to", val, &bm_dev_name) == 0) + *(fg->supplied_to + val) = (char *)bm_dev_name; + else { + dev_err(dev, "insufficient number of supplied_to data found\n"); + ret = -EINVAL; + goto free_dev_mem; + } + ret = of_property_read_u32(np, "thermister_on_batctrl", &pval); + if (ret) { + dev_err(dev, "missing property thermister_on_batctrl\n"); + ret = -EINVAL; + goto free_dev_mem; + } + bm_pdata->battery = &ab8500_bm_data; + bat = bm_pdata->battery; + ext_thermister = 0; + if (pval == 0) { + bat->n_btypes = 4; + bat->bat_type = bat_type_ext_thermister; + bat->adc_therm = ABx500_ADC_THERM_BATTEMP; + ext_thermister = 1; + } + ret = of_property_read_u32(np, "li_ion_9100", &pval); + if (ret) { + dev_err(dev, "missing property li_ion_9100\n"); + ret = -EINVAL; + goto free_dev_mem; + } + lion_battery = 0; + if (pval == 1) { + bat->no_maintenance = true; + bat->chg_unknown_bat = true; + bat->bat_type[BATTERY_UNKNOWN].charge_full_design = 2600; + bat->bat_type[BATTERY_UNKNOWN].termination_vol = 4150; + bat->bat_type[BATTERY_UNKNOWN].recharge_vol = 4130; + bat->bat_type[BATTERY_UNKNOWN].normal_cur_lvl = 520; + bat->bat_type[BATTERY_UNKNOWN].normal_vol_lvl = 4200; + lion_battery = 1; + } + /* select the battery resolution table */ + for (i = 0; i < bat->n_btypes; ++i) { + btype = (bat->bat_type + i); + if (ext_thermister) { + btype->batres_tbl = + temp_to_batres_tbl_ext_thermister; + } else if (lion_battery) { + btype->batres_tbl = + temp_to_batres_tbl_9100; + } else { + btype->batres_tbl = + temp_to_batres_tbl_thermister; + } + } + return ret; +free_dev_mem: + devm_kfree(dev, fg->supplied_to); +inval_pval: + return ret; +} + static int __devinit ab8500_fg_probe(struct platform_device *pdev) { int i, irq; int ret = 0; struct abx500_bm_plat_data *plat_data = pdev->dev.platform_data; + struct device_node *np = pdev->dev.of_node; struct ab8500_fg *di; + di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); + if (!di) { + dev_err(&pdev->dev, "%s no mem for ab8500_btemp\n", __func__); + ret = -ENOMEM; + goto err_no_mem; + } + if (np) { + if (!plat_data) { + plat_data = + devm_kzalloc(&pdev->dev, sizeof(*plat_data), GFP_KERNEL); + if (!plat_data) { + dev_err(&pdev->dev, + "%s no mem for plat_data\n", __func__); + ret = -ENOMEM; + goto free_device_info; + } + plat_data->fg = devm_kzalloc(&pdev->dev, + sizeof(*plat_data->fg), GFP_KERNEL); + if (!plat_data->fg) { + devm_kfree(&pdev->dev, plat_data); + dev_err(&pdev->dev, + "%s no mem for pdata->fg\n", + __func__); + ret = -ENOMEM; + goto free_device_info; + } + } + /* get battery specific platform data */ + ret = fg_of_probe(&pdev->dev, np, plat_data); + if (ret) { + devm_kfree(&pdev->dev, plat_data->fg); + devm_kfree(&pdev->dev, plat_data); + goto free_device_info; + } + } if (!plat_data) { - dev_err(&pdev->dev, "No platform data\n"); - return -EINVAL; + dev_err(&pdev->dev, + "%s no fg platform data found\n", __func__); + ret = -EINVAL; + goto free_device_info; } di = kzalloc(sizeof(*di), GFP_KERNEL); @@ -2606,11 +2737,17 @@ free_irq: free_inst_curr_wq: destroy_workqueue(di->fg_wq); free_device_info: - kfree(di); + devm_kfree(&pdev->dev, di); +err_no_mem: return ret; } +static const struct of_device_id ab8500_fg_match[] = { + {.compatible = "stericsson,ab8500-fg",}, + {}, +}; + static struct platform_driver ab8500_fg_driver = { .probe = ab8500_fg_probe, .remove = __devexit_p(ab8500_fg_remove), @@ -2619,6 +2756,7 @@ static struct platform_driver ab8500_fg_driver = { .driver = { .name = "ab8500-fg", .owner = THIS_MODULE, + .of_match_table = ab8500_fg_match, }, }; diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h index 1318ca6..ac4f590 100644 --- a/include/linux/mfd/abx500.h +++ b/include/linux/mfd/abx500.h @@ -382,7 +382,7 @@ struct abx500_bm_data { int gnd_lift_resistance; const struct abx500_maxim_parameters *maxi; const struct abx500_bm_capacity_levels *cap_levels; - const struct abx500_battery_type *bat_type; + struct abx500_battery_type *bat_type; const struct abx500_bm_charger_parameters *chg_params; const struct abx500_fg_parameters *fg_params; }; -- 1.7.9.5

11 years, 8 months

Test Result Summary for Calendar Week 37.

by Botao Sun

Calendar Week 37: Here is test result summary for Linaro ubuntu platform on following boards: 1) ARM Versatile Express A9; 2) Samsung Origen; 3) TI Panda Board 4430; 4) TI Panda Board 4460. *Synopsis: Power Management test lets Panda 4430 crashed, but works well on Panda 4460. Device tree is still unavailable on Versatile Express A9. YouTube backs to work on Origen but Power Management test hangs the board. Application debug in DS-5 is unavailable on all boards.* 1. vexpress A9 + ubuntu (Column Y): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdFNmV… "reboot" works. This is the only difference between last week and this week test result. Device tree blob files have disappeared for more than 1 month, and DS-5 application debug is still unavailable. 480p video totally can't be played back, and this issue has exists for 8 weeks. In past, the video can be played, but not smoothly; now it doesn't work at all. 2. Origen + ubuntu (Column U): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEowN… YouTube works, although the FPS is low but it's at least acceptable now. All the other features status remain the same as last week. The power management test still hangs system, and this issue has been there for 5 weeks. Also, WiFi has been unavailable for 3 weeks. For more details, please click above link. 3. Panda 4430 + ubuntu (Column V): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEwwZ… YouTube starts to work, after video buffering completed, it can play video well. 1080p video now can be played well too, with this extra codec package - "ubuntu-omap4-extras-multimedia". Power management starts to let system crash but it worked well in last week. DS-5 data streaming works with this package installed - "gator-module-dkms". For suspend / resume test, the board can't be woken up. All the others remain the same as last week. 4. Panda 4460 + ubuntu (Column V): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEwwZ… Although file transfer via Bluetooth is still unavailable, the other features works well, such like device pairing, Bluetooth headset, etc. Power management test fully passed in this image. For DS-5, after install "gator-module-dkms", data streaming works well too, although application debug feature is still unavailable. All the other features remain the same, please refer to above test result spreadsheet to find more. For the previous week (Calendar week 36) summary, please refer to attachment. Thank you. BR Botao Sun

11 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev September 2012