ASoC: codecs: wsa881x: handle timeouts in resume path

[ 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>

diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c
index 616b26c70c3b2681622dc1628c3728b905eea880..649c7e73f7744d869cd3727fc43236ad137bf027 100644 (file)
--- 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);