Message ID | 1528120764-14316-8-git-send-email-m.purski@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Maciej, Thank you for the patch! Yet something to improve: [auto build test ERROR on regulator/for-next] [also build test ERROR on next-20180604] [cannot apply to v4.17] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Maciej-Purski/regulator-core-Add-debug-messages/20180605-052333 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next config: x86_64-randconfig-x011-201822 (attached as .config) compiler: gcc-7 (Debian 7.3.0-16) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): drivers//regulator/core.c: In function 'regulator_set_voltage_unlocked': >> drivers//regulator/core.c:3046:1: error: version control conflict marker in file <<<<<<< HEAD ^~~~~~~ drivers//regulator/core.c:3048:1: error: version control conflict marker in file ======= ^~~~~~~ vim +3046 drivers//regulator/core.c 3035 3036 static int regulator_set_voltage_unlocked(struct regulator *regulator, 3037 int min_uV, int max_uV, 3038 suspend_state_t state) 3039 { 3040 struct regulator_dev *rdev = regulator->rdev; 3041 struct regulator_voltage *voltage = ®ulator->voltage[state]; 3042 int ret = 0; 3043 int old_min_uV, old_max_uV; 3044 int current_uV; 3045 > 3046 <<<<<<< HEAD 3047 pr_err("%s: %d\n", __func__, __LINE__); 3048 ======= 3049 if (rdev->coupling_desc.n_resolved != rdev->coupling_desc.n_coupled) { 3050 rdev_err(rdev, "not all coupled regulators registered\n"); 3051 ret = -EPERM; 3052 goto out; 3053 } 3054 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Maciej, Thank you for the patch! Yet something to improve: [auto build test ERROR on regulator/for-next] [also build test ERROR on next-20180604] [cannot apply to v4.17] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Maciej-Purski/regulator-core-Add-debug-messages/20180605-052333 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next config: i386-randconfig-a1-06041847 (attached as .config) compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 reproduce: # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): drivers/regulator/core.c: In function 'regulator_set_voltage_unlocked': >> drivers/regulator/core.c:3046:1: error: expected expression before '<<' token <<<<<<< HEAD ^ drivers/regulator/core.c:3048:1: error: expected expression before '==' token ======= ^ vim +3046 drivers/regulator/core.c 3035 3036 static int regulator_set_voltage_unlocked(struct regulator *regulator, 3037 int min_uV, int max_uV, 3038 suspend_state_t state) 3039 { 3040 struct regulator_dev *rdev = regulator->rdev; 3041 struct regulator_voltage *voltage = ®ulator->voltage[state]; 3042 int ret = 0; 3043 int old_min_uV, old_max_uV; 3044 int current_uV; 3045 > 3046 <<<<<<< HEAD 3047 pr_err("%s: %d\n", __func__, __LINE__); 3048 ======= 3049 if (rdev->coupling_desc.n_resolved != rdev->coupling_desc.n_coupled) { 3050 rdev_err(rdev, "not all coupled regulators registered\n"); 3051 ret = -EPERM; 3052 goto out; 3053 } 3054 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 2a7ffb7..2dd1f99 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2296,6 +2296,11 @@ int regulator_enable(struct regulator *regulator) int ret = 0; pr_err("%s: %d\n", __func__, __LINE__); + if (rdev->coupling_desc.n_resolved != rdev->coupling_desc.n_coupled) { + rdev_err(rdev, "not all coupled regulators registered\n"); + return -EPERM; + } + if (regulator->always_on) return 0; @@ -2307,6 +2312,9 @@ int regulator_enable(struct regulator *regulator) regulator_lock_dependent(rdev); ret = _regulator_enable(rdev); + /* balance only if there are regulators coupled */ + if (rdev->coupling_desc.n_coupled > 1) + regulator_balance_voltage(rdev, PM_SUSPEND_ON); regulator_unlock_dependent(rdev); if (ret != 0 && rdev->supply) @@ -2417,6 +2425,8 @@ int regulator_disable(struct regulator *regulator) regulator_lock_dependent(rdev); ret = _regulator_disable(rdev); + if (rdev->coupling_desc.n_coupled > 1) + regulator_balance_voltage(rdev, PM_SUSPEND_ON); regulator_unlock_dependent(rdev); if (ret == 0 && rdev->supply) @@ -2470,6 +2480,8 @@ int regulator_force_disable(struct regulator *regulator) regulator_lock_dependent(rdev); regulator->uA_load = 0; ret = _regulator_force_disable(regulator->rdev); + if (rdev->coupling_desc.n_coupled > 1) + regulator_balance_voltage(rdev, PM_SUSPEND_ON); regulator_unlock_dependent(rdev); if (rdev->supply) @@ -3031,7 +3043,16 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, int old_min_uV, old_max_uV; int current_uV; +<<<<<<< HEAD pr_err("%s: %d\n", __func__, __LINE__); +======= + if (rdev->coupling_desc.n_resolved != rdev->coupling_desc.n_coupled) { + rdev_err(rdev, "not all coupled regulators registered\n"); + ret = -EPERM; + goto out; + } + +>>>>>>> fcbf6fa... regulator: core: Enable voltage balancing /* If we're setting the same range as last time the change * should be a noop (some cpufreq implementations use the same * voltage for multiple frequencies, for example). @@ -3074,7 +3095,8 @@ static int regulator_set_voltage_unlocked(struct regulator *regulator, if (ret < 0) goto out2; - ret = regulator_set_voltage_rdev(rdev, min_uV, max_uV, state); + /* for not coupled regulators this will just set the voltage */ + ret = regulator_balance_voltage(rdev, state); if (ret < 0) goto out2;
Call regulator_balance_voltage() instead of set_voltage_rdev() in set_voltage_unlocked() and in enabling and disabling functions, but only if the regulator is coupled. Signed-off-by: Maciej Purski <m.purski@samsung.com> --- drivers/regulator/core.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)