Commit f21e0e81 authored by Mark Brown's avatar Mark Brown Committed by Liam Girdwood

regulator: Do bulk enables of regulators in parallel

In order to reduce the impact of ramp times rather than enabling the
regulators for a device in series use async tasks to run the actual
enables. This means that the delays which the enables implement can all
run in parallel, though it does mean that the order in which the
supplies come on may be unstable.

For super bonus fun points if any of the regulators are shared between
multiple supplies on the same device (as is rather likely) then this
will test our locking.  Note that in this case we only delay once for
each physical regulator so the threads shouldn't block each other while
delaying.

It'd be even nicer if we could coalesce writes to a shared enable registers
in PMICs but that's definitely future work, and it may also be useful
and is certainly more achievable to optimise out the parallelism if none
of the regulators implement ramp delays.
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 55922c9d
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/async.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/suspend.h> #include <linux/suspend.h>
...@@ -2264,6 +2265,13 @@ int regulator_bulk_get(struct device *dev, int num_consumers, ...@@ -2264,6 +2265,13 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
} }
EXPORT_SYMBOL_GPL(regulator_bulk_get); EXPORT_SYMBOL_GPL(regulator_bulk_get);
static void regulator_bulk_enable_async(void *data, async_cookie_t cookie)
{
struct regulator_bulk_data *bulk = data;
bulk->ret = regulator_enable(bulk->consumer);
}
/** /**
* regulator_bulk_enable - enable multiple regulator consumers * regulator_bulk_enable - enable multiple regulator consumers
* *
...@@ -2279,21 +2287,33 @@ EXPORT_SYMBOL_GPL(regulator_bulk_get); ...@@ -2279,21 +2287,33 @@ EXPORT_SYMBOL_GPL(regulator_bulk_get);
int regulator_bulk_enable(int num_consumers, int regulator_bulk_enable(int num_consumers,
struct regulator_bulk_data *consumers) struct regulator_bulk_data *consumers)
{ {
LIST_HEAD(async_domain);
int i; int i;
int ret; int ret = 0;
for (i = 0; i < num_consumers; i++)
async_schedule_domain(regulator_bulk_enable_async,
&consumers[i], &async_domain);
async_synchronize_full_domain(&async_domain);
/* If any consumer failed we need to unwind any that succeeded */
for (i = 0; i < num_consumers; i++) { for (i = 0; i < num_consumers; i++) {
ret = regulator_enable(consumers[i].consumer); if (consumers[i].ret != 0) {
if (ret != 0) ret = consumers[i].ret;
goto err; goto err;
} }
}
return 0; return 0;
err: err:
pr_err("Failed to enable %s: %d\n", consumers[i].supply, ret); for (i = 0; i < num_consumers; i++)
for (--i; i >= 0; --i) if (consumers[i].ret == 0)
regulator_disable(consumers[i].consumer); regulator_disable(consumers[i].consumer);
else
pr_err("Failed to enable %s: %d\n",
consumers[i].supply, consumers[i].ret);
return ret; return ret;
} }
......
...@@ -122,6 +122,9 @@ struct regulator; ...@@ -122,6 +122,9 @@ struct regulator;
struct regulator_bulk_data { struct regulator_bulk_data {
const char *supply; const char *supply;
struct regulator *consumer; struct regulator *consumer;
/* Internal use */
int ret;
}; };
#if defined(CONFIG_REGULATOR) #if defined(CONFIG_REGULATOR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment