On Odroid XU3/4 and other Exynos5422 based boards there is a case, that
different devices on the board are supplied by different regulators
with non-fixed voltages. If one of these devices temporarily requires
higher voltage, there might occur a situation that the spread between
two devices' voltages is so high, that there is a risk of changing
'high' and 'low' states on the interconnection between devices powered
by those regulators.
Introduce new function regulator_balance_coupled() which
keeps max_spread constraint fulfilled between all coupled regulators.
It should be called if any coupled regulator changes its voltage or
after disabling or enabling. Disabled regulators should follow changes
of the enabled ones and their consumers' demands shouldn't be taken
into account while changing voltage of enabled regulators.
Find voltages, which are closest to suiting all the consumers' demands
while fulfilling max_spread constraint, keeping the following rules:
- if one regulator is about to rise its voltage, rise others
voltages if needed
- if the regulator, which has caused rising other regulators, is
lowered, lower the other regulators if possible
- if one regulator is about to lower its voltage, but it hasn't caused
rising other regulators, don't change its voltage if it's not allowed
Change regulators' voltages step by step, keeping max_spread constraint
fulfilled all the time. Function regulator_coupled_get_optimal_voltage()
should find the best possible change for the regulator, which doesn't break
max_spread constraint. In function regulator_balance_coupled_voltage()
optimize number of steps by finding highest voltage difference on each
iteration.
Signed-off-by: Maciej Purski <m.purski@xxxxxxxxxxx>
---
drivers/regulator/core.c | 292 ++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 276 insertions(+), 16 deletions(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index a6cf902..d2d910d 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -107,6 +107,9 @@ static int _notifier_call_chain(struct regulator_dev *rdev,
unsigned long event, void *data);
static int _regulator_do_set_voltage(struct regulator_dev *rdev,
int min_uV, int max_uV);
+static int regulator_set_voltage_rdev(struct regulator_dev *rdev,
+ int min_uV, int max_uV);
+static int regulator_balance_coupled(struct coupled_reg_desc *c_desc);
static struct regulator *create_regulator(struct regulator_dev *rdev,
struct device *dev,
const char *supply_name);
@@ -185,6 +188,48 @@ static void regulator_unlock_supply(struct regulator_dev *rdev)
}
/**
+ * regulator_lock_coupled - lock a group of coupled regulators
+ * @c_desc: coupled regulators description source
+ */
+static void regulator_lock_coupled(struct coupled_reg_desc *c_desc)
+{
+ int n_coupled = c_desc->n_coupled;
+ int i;
+
+ for (i = 0; i < n_coupled; i++)
+ mutex_lock_nested(&c_desc->coupled_rdevs[i]->mutex, i);
+}
+
+/**
+ * regulator_unlock_coupled - unlock a group of coupled regulators
+ * @c_desc: coupled regulators description source
+ */
+static void regulator_unlock_coupled(struct coupled_reg_desc *c_desc)
+{
+ int n_coupled = c_desc->n_coupled;
+ int i;
+
+ for (i = 0; i < n_coupled; i++)
+ mutex_unlock(&c_desc->coupled_rdevs[i]->mutex);
+}
+
+static void regulator_lock_supply_parents(struct regulator_dev *rdev)
+{
+ struct regulator_dev *supply = rdev_get_supply(rdev);
+
+ if (supply)
+ regulator_lock_supply(supply);
+}
+
+static void regulator_unlock_supply_parents(struct regulator_dev *rdev)
+{
+ struct regulator_dev *supply = rdev_get_supply(rdev);
+
+ if (supply)
+ regulator_unlock_supply(supply);
+}
+
+/**
* of_get_regulator - get a regulator device node based on supply name
* @dev: Device pointer for the consumer (of regulator) device
* @supply: regulator supply name
@@ -2218,6 +2263,13 @@ int regulator_enable(struct regulator *regulator)
if (ret != 0 && rdev->supply)
regulator_disable(rdev->supply);
+ /*
+ * If the regulator is coupled with other regulators, we have to
+ * balance their voltages to keep the max_spread constraint.
+ */
+ if (rdev->coupled_desc)
+ regulator_balance_coupled(rdev->coupled_desc);
+
return ret;
}
EXPORT_SYMBOL_GPL(regulator_enable);
@@ -2323,6 +2375,13 @@ int regulator_disable(struct regulator *regulator)
ret = _regulator_disable(rdev);
mutex_unlock(&rdev->mutex);
+ /*
+ * If the regulator is coupled with other regulators, we can now
+ * balance their voltages without checking the disabled regulator.
+ */
+ if (rdev->coupled_desc)
+ regulator_balance_coupled(rdev->coupled_desc);
+
if (ret == 0 && rdev->supply)
regulator_disable(rdev->supply);
@@ -2379,6 +2438,13 @@ int regulator_force_disable(struct regulator *regulator)
while (rdev->open_count--)
regulator_disable(rdev->supply);
+ /*
+ * If the regulator is coupled with other regulators, we can now
+ * balance their voltages without checking the disabled regulator.
+ */
+ if (rdev->coupled_desc)
+ regulator_balance_coupled(rdev->coupled_desc);
+
return ret;
}
EXPORT_SYMBOL_GPL(regulator_force_disable);
@@ -2460,10 +2526,9 @@ static int _regulator_is_enabled(struct regulator_dev *rdev)
return rdev->desc->ops->is_enabled(rdev);
}
-static int _regulator_list_voltage(struct regulator *regulator,
- unsigned selector, int lock)
+static int _regulator_list_voltage(struct regulator_dev *rdev,
+ unsigned selector, int lock)
{
- struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops;
int ret;
@@ -2479,7 +2544,8 @@ static int _regulator_list_voltage(struct regulator *regulator,
if (lock)
mutex_unlock(&rdev->mutex);
} else if (rdev->is_switch && rdev->supply) {
- ret = _regulator_list_voltage(rdev->supply, selector, lock);
+ ret = _regulator_list_voltage(rdev->supply->rdev,
+ selector, lock);
} else {
return -EINVAL;
}
@@ -2555,7 +2621,7 @@ EXPORT_SYMBOL_GPL(regulator_count_voltages);
*/
int regulator_list_voltage(struct regulator *regulator, unsigned selector)
{
- return _regulator_list_voltage(regulator, selector, 1);
+ return _regulator_list_voltage(regulator->rdev, selector, 1);
}
EXPORT_SYMBOL_GPL(regulator_list_voltage);
@@ -2896,8 +2962,6 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
int ret = 0;
int old_min_uV, old_max_uV;
int current_uV;
- int best_supply_uV = 0;
- int supply_change_uV = 0;
/* If we're setting the same range as last time the change
* should be a noop (some cpufreq implementations use the same
@@ -2941,6 +3005,34 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
if (ret < 0)
goto out2;
+ /*
+ * If the regulator is coupled, return after changing consumer demands
+ * without changing voltage. This will be handled outside the function
+ * by regulator_balance_coupled()
+ */
+ if (rdev->coupled_desc)
+ goto out;
+
+ ret = regulator_set_voltage_rdev(regulator->rdev, min_uV, max_uV);
+ if (ret < 0)
+ goto out2;
+
+out:
+ return 0;
+out2:
+ regulator->min_uV = old_min_uV;
+ regulator->max_uV = old_max_uV;
+
+ return ret;
+}
+
+static int regulator_set_voltage_rdev(struct regulator_dev *rdev, int min_uV,
+ int max_uV)
+{
+ int best_supply_uV = 0;
+ int supply_change_uV = 0;
+ int ret;
+
if (rdev->supply &&
regulator_ops_is_valid(rdev->supply->rdev,
REGULATOR_CHANGE_VOLTAGE) &&
@@ -2952,13 +3044,13 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
selector = regulator_map_voltage(rdev, min_uV, max_uV);
if (selector < 0) {
ret = selector;
- goto out2;
+ goto out;
}
- best_supply_uV = _regulator_list_voltage(regulator, selector, 0);
+ best_supply_uV = _regulator_list_voltage(rdev, selector, 0);
if (best_supply_uV < 0) {
ret = best_supply_uV;
- goto out2;
+ goto out;
}
best_supply_uV += rdev->desc->min_dropout_uV;
@@ -2966,7 +3058,7 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
current_supply_uV = _regulator_get_voltage(rdev->supply->rdev);
if (current_supply_uV < 0) {
ret = current_supply_uV;
- goto out2;
+ goto out;
}
supply_change_uV = best_supply_uV - current_supply_uV;
@@ -2978,13 +3070,13 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
if (ret) {
dev_err(&rdev->dev, "Failed to increase supply voltage: %d\n",
ret);
- goto out2;
+ goto out;
}
}
ret = _regulator_do_set_voltage(rdev, min_uV, max_uV);
if (ret < 0)
- goto out2;
+ goto out;
if (supply_change_uV < 0) {
ret = regulator_set_voltage_unlocked(rdev->supply,
@@ -2998,9 +3090,174 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator,
out:
return ret;
-out2:
- regulator->min_uV = old_min_uV;
- regulator->max_uV = old_max_uV;
+}
+
+static int regulator_coupled_get_optimal_voltage(struct regulator_dev *rdev)
+{
+ struct coupled_reg_desc *c_desc = rdev->coupled_desc;
+ struct regulator_dev **c_rdevs = c_desc->coupled_rdevs;
+ int max_spread = c_desc->max_spread;
+ int n_coupled = c_desc->n_coupled;
+ int desired_min_uV, desired_max_uV, min_actual_uV = INT_MAX;
+ int max_actual_uV = 0, highest_min_uV = 0, target_uV, possible_uV;
+ int i, ret;
+
+ /* If consumers don't provide any demands, set voltage to min_uV */
+ desired_min_uV = rdev->constraints->min_uV;
+ desired_max_uV = rdev->constraints->max_uV;
+ ret = regulator_check_consumers(rdev,
+ &desired_min_uV,
+ &desired_max_uV);
+ if (ret < 0)
+ goto out;
+
+ /* Find highest min desired voltage */
+ for (i = 0; i < n_coupled; i++) {
+ int tmp_min = 0;
+ int tmp_max = INT_MAX;
+
+ if (!_regulator_is_enabled(c_rdevs[i]))
+ continue;
+
+ ret = regulator_check_consumers(c_rdevs[i],
+ &tmp_min,
+ &tmp_max);
+ if (ret < 0)
+ goto out;
+
+ if (tmp_min > highest_min_uV)
+ highest_min_uV = tmp_min;
+ }
+
+ /*
+ * Let target_uV be equal to the desired one if possible.
+ * If not, set it to minimum voltage, allowed by other coupled
+ * regulators.
+ */
+ target_uV = max(desired_min_uV, highest_min_uV - max_spread);
+
+ /*
+ * Find min and max voltages, which currently aren't
+ * violating max_spread
+ */
+ for (i = 0; i < n_coupled; i++) {
+ int tmp_act;
+
+ /*
+ * Don't check the regulator, which is about
+ * to change voltage
+ */
+ if (c_rdevs[i] == rdev)
+ continue;
+ if (!_regulator_is_enabled(c_rdevs[i]))
+ continue;
+
+ tmp_act = _regulator_get_voltage(c_rdevs[i]);
+ if (tmp_act < 0) {
+ ret = tmp_act;
+ goto out;
+ }
+
+ if (tmp_act < min_actual_uV)
+ min_actual_uV = tmp_act;
+
+ if (tmp_act > max_actual_uV)
+ max_actual_uV = tmp_act;
+ }
+
+ /* There aren't any other regulators enabled */
+ if (max_actual_uV == 0) {
+ possible_uV = target_uV;
+ } else {
+ /*
+ * Correct target voltage, so as it currently isn't
+ * violating max_spread
+ */
+ possible_uV = max(target_uV, max_actual_uV - max_spread);
+ possible_uV = min(possible_uV, min_actual_uV + max_spread);
+ }
+
+ if (possible_uV > desired_max_uV) {
+ ret = -EINVAL;
+ goto out;
+ }
+ ret = possible_uV;
+
+out:
+ return ret;
+}
+
+static int regulator_balance_coupled(struct coupled_reg_desc *c_desc)
+{
+ struct regulator_dev **c_rdevs = c_desc->coupled_rdevs;
+ int n_coupled = c_desc->n_coupled;
+ int i, best_delta, best_index, best_uV, ret = 1;
+
+ /*
+ * Find the best possible voltage change on each loop. Leave the loop
+ * if there isn't any possible change.
+ */
+ while (1) {
+ best_delta = 0;
+ best_uV = 0;
+ best_index = -1;
+
+ regulator_lock_coupled(c_desc);
+
+ /*
+ * Find highest difference between optimal voltage
+ * and actual voltage.
+ */
+ for (i = 0; i < n_coupled; i++) {
+ /*
+ * optimal_uV is the best voltage that can be set for
+ * i-th regulator at the moment without violating
+ * max_spread constraint in order to balance
+ * the coupled voltages.
+ */
+ int optimal_uV, actual_uV;
+
+ optimal_uV = regulator_coupled_get_optimal_voltage(c_rdevs[i]);
+ if (optimal_uV < 0) {
+ ret = optimal_uV;
+ goto unlock;
+ }
+
+ actual_uV = _regulator_get_voltage(c_rdevs[i]);
+ if (actual_uV < 0) {
+ ret = optimal_uV;
+ goto unlock;
+ }
+
+ if (abs(best_delta) < abs(optimal_uV - actual_uV)) {
+ best_delta = optimal_uV - actual_uV;
+ best_index = i;
+ best_uV = optimal_uV;
+ }
+ }
+
+ /* Nothing to change, return successfully */
+ if (best_index == -1) {
+ ret = 0;
+ goto unlock;
+ }
+ /*
+ * Lock just the supply regulators, as the regulator itself
+ * is already locked by regulator_lock_coupled().
+ */
+ regulator_lock_supply_parents(c_rdevs[best_index]);
+
+ ret = regulator_set_voltage_rdev(c_rdevs[best_index], best_uV,
+ best_uV);
+
+ regulator_unlock_supply_parents(c_rdevs[best_index]);
+
+unlock:
+ regulator_unlock_coupled(c_desc);
+
+ if (ret < 0 || best_index == -1)
+ break;
+ }
return ret;
}
@@ -3033,6 +3290,9 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
regulator_unlock_supply(regulator->rdev);
+ if (regulator->rdev->coupled_desc)
+ ret = regulator_balance_coupled(regulator->rdev->coupled_desc);
+
return ret;
}
EXPORT_SYMBOL_GPL(regulator_set_voltage);
--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
