lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 429/542] regmap: fix writes to non incrementing registers
    Date
    From: Ben Whitten <ben.whitten@gmail.com>

    [ Upstream commit 2e31aab08bad0d4ee3d3d890a7b74cb6293e0a41 ]

    When checking if a register block is writable we must ensure that the
    block does not start with or contain a non incrementing register.

    Fixes: 8b9f9d4dc511 ("regmap: verify if register is writeable before writing operations")
    Signed-off-by: Ben Whitten <ben.whitten@gmail.com>
    Link: https://lore.kernel.org/r/20200118205625.14532-1-ben.whitten@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/base/regmap/regmap.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
    index 19f57ccfbe1d7..59f911e577192 100644
    --- a/drivers/base/regmap/regmap.c
    +++ b/drivers/base/regmap/regmap.c
    @@ -1488,11 +1488,18 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg,

    WARN_ON(!map->bus);

    - /* Check for unwritable registers before we start */
    - for (i = 0; i < val_len / map->format.val_bytes; i++)
    - if (!regmap_writeable(map,
    - reg + regmap_get_offset(map, i)))
    - return -EINVAL;
    + /* Check for unwritable or noinc registers in range
    + * before we start
    + */
    + if (!regmap_writeable_noinc(map, reg)) {
    + for (i = 0; i < val_len / map->format.val_bytes; i++) {
    + unsigned int element =
    + reg + regmap_get_offset(map, i);
    + if (!regmap_writeable(map, element) ||
    + regmap_writeable_noinc(map, element))
    + return -EINVAL;
    + }
    + }

    if (!map->cache_bypass && map->format.parse_val) {
    unsigned int ival;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:54    [W:2.561 / U:2.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site