ASoC: rt715-sdca-sdw: use first_hw_init flag on resume

The intent of the status check on resume was to verify if a SoundWire
peripheral reported ATTACHED before waiting for the initialization to
complete. This is required to avoid timeouts that will happen with
'ghost' devices that are exposed in the platform firmware but are not
populated in hardware.

Unfortunately we used 'hw_init' instead of 'first_hw_init'. Due to
another error, the resume operation never timed out, but the volume
settings were not properly restored.

This patch renames the status flag to 'first_hw_init' for consistency
with other drivers (was 'first_init')

BugLink: https://github.com/thesofproject/linux/issues/2908
BugLink: https://github.com/thesofproject/linux/issues/2637
Fixes: 20d17057f0a8c ('ASoC: rt715-sdca: Add RT715 sdca vendor-specific driver')
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: Bard Liao <bard.liao@intel.com>
Link: https://lore.kernel.org/r/20210607222239.582139-10-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index 1350798..7646bbe 100644 (file)
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -224,7 +224,7 @@ static int __maybe_unused rt715_dev_resume(struct device *dev)
        struct rt715_sdca_priv *rt715 = dev_get_drvdata(dev);
        unsigned long time;
 
-       if (!rt715->hw_init)
+       if (!rt715->first_hw_init)
                return 0;
 
        if (!slave->unattach_request)

diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c
index 7db76c1..d82166f 100644 (file)
--- a/sound/soc/codecs/rt715-sdca.c
+++ b/sound/soc/codecs/rt715-sdca.c
@@ -997,7 +997,7 @@ int rt715_sdca_init(struct device *dev, struct regmap *mbq_regmap,
         * HW init will be performed when device reports present
         */
        rt715->hw_init = false;
-       rt715->first_init = false;
+       rt715->first_hw_init = false;
 
        ret = devm_snd_soc_register_component(dev,
                        &soc_codec_dev_rt715_sdca,
@@ -1018,7 +1018,7 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave)
        /*
         * PM runtime is only enabled when a Slave reports as Attached
         */
-       if (!rt715->first_init) {
+       if (!rt715->first_hw_init) {
                /* set autosuspend parameters */
                pm_runtime_set_autosuspend_delay(&slave->dev, 3000);
                pm_runtime_use_autosuspend(&slave->dev);
@@ -1031,7 +1031,7 @@ int rt715_sdca_io_init(struct device *dev, struct sdw_slave *slave)
 
                pm_runtime_enable(&slave->dev);
 
-               rt715->first_init = true;
+               rt715->first_hw_init = true;
        }
 
        pm_runtime_get_noresume(&slave->dev);

diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h
index 85ce4d9..0c1fdd5 100644 (file)
--- a/sound/soc/codecs/rt715-sdca.h
+++ b/sound/soc/codecs/rt715-sdca.h
@@ -27,7 +27,7 @@ struct rt715_sdca_priv {
        enum sdw_slave_status status;
        struct sdw_bus_params params;
        bool hw_init;
-       bool first_init;
+       bool first_hw_init;
        int l_is_unmute;
        int r_is_unmute;
        int hw_sdw_ver;