lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 0850/1095] ASoC: codecs: wsa881x: handle timeouts in resume path
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    [ Upstream commit cf6af24b54903f9f70c29b3e5b19cb72cc862d60 ]

    Currently we do not check if SoundWire slave initialization timeout
    expired before continuing to access its registers.

    Its possible that the registers are not accessible if timeout is
    expired. Handle this by returning timeout in resume path.

    Reported-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Fixes: 8dd552458361 ("ASoC: codecs: wsa881x: add runtime pm support")
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20220630130023.9308-1-srinivas.kandagatla@linaro.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/wsa881x.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c
    index 616b26c70c3b..649c7e73f774 100644
    --- a/sound/soc/codecs/wsa881x.c
    +++ b/sound/soc/codecs/wsa881x.c
    @@ -1174,11 +1174,17 @@ static int __maybe_unused wsa881x_runtime_resume(struct device *dev)
    struct sdw_slave *slave = dev_to_sdw_dev(dev);
    struct regmap *regmap = dev_get_regmap(dev, NULL);
    struct wsa881x_priv *wsa881x = dev_get_drvdata(dev);
    + unsigned long time;

    gpiod_direction_output(wsa881x->sd_n, 1);

    - wait_for_completion_timeout(&slave->initialization_complete,
    - msecs_to_jiffies(WSA881X_PROBE_TIMEOUT));
    + time = wait_for_completion_timeout(&slave->initialization_complete,
    + msecs_to_jiffies(WSA881X_PROBE_TIMEOUT));
    + if (!time) {
    + dev_err(dev, "Initialization not complete, timed out\n");
    + gpiod_direction_output(wsa881x->sd_n, 0);
    + return -ETIMEDOUT;
    + }

    regcache_cache_only(regmap, false);
    regcache_sync(regmap);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 00:36    [W:4.047 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site