lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 080/241] regulator: core: Limit propagation of parent voltage count and list
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matthias Kaehlcke <mka@chromium.org>


    [ Upstream commit fd086045559d90cd7854818b4c60a7119eda6231 ]

    Commit 26988efe11b1 ("regulator: core: Allow to get voltage count and
    list from parent") introduces the propagation of the parent voltage
    count and list for regulators that don't provide this information
    themselves. The goal is to support simple switch regulators, however as
    a side effect normal continuous regulators can leak details of their
    supplies and provide consumers with inconsistent information.

    Limit the propagation of the voltage count and list to switch
    regulators.

    Fixes: 26988efe11b1 ("regulator: core: Allow to get voltage count and
    list from parent")
    Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
    Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
    Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/regulator/core.c | 9 +++++++--
    include/linux/regulator/driver.h | 2 ++
    2 files changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/regulator/core.c
    +++ b/drivers/regulator/core.c
    @@ -2465,7 +2465,7 @@ static int _regulator_list_voltage(struc
    ret = ops->list_voltage(rdev, selector);
    if (lock)
    mutex_unlock(&rdev->mutex);
    - } else if (rdev->supply) {
    + } else if (rdev->is_switch && rdev->supply) {
    ret = _regulator_list_voltage(rdev->supply, selector, lock);
    } else {
    return -EINVAL;
    @@ -2523,7 +2523,7 @@ int regulator_count_voltages(struct regu
    if (rdev->desc->n_voltages)
    return rdev->desc->n_voltages;

    - if (!rdev->supply)
    + if (!rdev->is_switch || !rdev->supply)
    return -EINVAL;

    return regulator_count_voltages(rdev->supply);
    @@ -4049,6 +4049,11 @@ regulator_register(const struct regulato
    mutex_unlock(&regulator_list_mutex);
    }

    + if (!rdev->desc->ops->get_voltage &&
    + !rdev->desc->ops->list_voltage &&
    + !rdev->desc->fixed_uV)
    + rdev->is_switch = true;
    +
    ret = device_register(&rdev->dev);
    if (ret != 0) {
    put_device(&rdev->dev);
    --- a/include/linux/regulator/driver.h
    +++ b/include/linux/regulator/driver.h
    @@ -425,6 +425,8 @@ struct regulator_dev {
    struct regulator_enable_gpio *ena_pin;
    unsigned int ena_gpio_state:1;

    + unsigned int is_switch:1;
    +
    /* time when this regulator was disabled last time */
    unsigned long last_off_jiffy;
    };

    \
     
     \ /
      Last update: 2018-03-19 20:43    [W:4.156 / U:0.376 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site