regulator: Use regulator_lock_supply() for get_voltage() too
Mark Brown
maintainerPATCH 1/1 regulator: Use regulator_lock_supply() for get_voltage() too
Since we need to read voltages of parents as part of setting supply voltages we need to be able to do get_voltage() internally without taking locks so reorganize the locking to take locks on the full tree on entry rather than as we recurse when called externally.
--- drivers/regulator/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/core.c +3 -3
@@ -3110,7 +3110,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) }else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages ==1 )) { ret = rdev->desc->fixed_uV; }else if (rdev->supply) { - ret =regulator_get_voltage (rdev->supply); + ret =_regulator_get_voltage (rdev->supply->rdev); }else {return -EINVAL ; }
@@ -3133,11 +3133,11 @@ int regulator_get_voltage(struct regulator *regulator) {int ret; -mutex_lock (®ulator->rdev->mutex); +regulator_lock_supply (regulator->rdev); ret =_regulator_get_voltage (regulator->rdev); -mutex_unlock (®ulator->rdev->mutex); +regulator_unlock_supply (regulator->rdev);return ret; }
Signature · 1 line
2.6.2
Mark Brown
maintainerApplied "regulator: Use regulator_lock_supply() for get_voltage() too" to the regulator tree
The patch
regulator: Use regulator_lock_supply() for get_voltage() too
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
e8debdfce55c8fcf2c9448b6adfd06ec75b7a844Mon Sep 17 00:00:00 2001
From: Mark Brown <[email protected]>
Date: Tue, 3 Nov 2015 05:58:14 +0000
Subject: [PATCH] regulator: Use regulator_lock_supply() for get_voltage() too
Since we need to read voltages of parents as part of setting supply voltages we need to be able to do get_voltage() internally without taking locks so reorganize the locking to take locks on the full tree on entry rather than as we recurse when called externally.
--- drivers/regulator/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/regulator/core.c +3 -3
@@ -3055,7 +3055,7 @@ static int _regulator_get_voltage(struct regulator_dev *rdev) }else if (rdev->desc->fixed_uV && (rdev->desc->n_voltages ==1 )) { ret = rdev->desc->fixed_uV; }else if (rdev->supply) { - ret =regulator_get_voltage (rdev->supply); + ret =_regulator_get_voltage (rdev->supply->rdev); }else {return -EINVAL ; }
@@ -3078,11 +3078,11 @@ int regulator_get_voltage(struct regulator *regulator) {int ret; -mutex_lock (®ulator->rdev->mutex); +regulator_lock_supply (regulator->rdev); ret =_regulator_get_voltage (regulator->rdev); -mutex_unlock (®ulator->rdev->mutex); +regulator_unlock_supply (regulator->rdev);return ret; }
Signature · 1 line
2.6.2
Quoted 7 lines · Mark Brown
Since we need to read voltages of parents as part of setting supply voltages we need to be able to do
get_voltage()internally without taking locks so reorganize the locking to take locks on the full tree on entry rather than as we recurse when called externally.Reported-by John Stultz <[email protected]>Signed-off-by Mark Brown <[email protected]>
This resolves the issue for me, thanks!
-john