Unverified Commit 279be591 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: rt715: enable pm_runtime in probe, keep status as 'suspended' 



This patch suggests enabling pm_runtime during the probe, but marking the
device as 'active' only after it is enumerated. That will force a
dependency between the card and the codec, pm_runtime_get_sync() will
have to wait for the codec device to resume and hence implicitly wait
for the enumeration/initialization to be completed. In the nominal
case where the codec device is already active the get_sync() would
only perform a ref-count increase.

The changes are directly inspired by RT711 and RT711-sdca changes.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230802153629.53576-10-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8d890ece

sound/soc/codecs/rt715-sdw.c

+1 −4
Original line number Diff line number Diff line
@@ -513,9 +513,6 @@ static int rt715_sdw_probe(struct sdw_slave *slave, 


static int rt715_sdw_remove(struct sdw_slave *slave)

{

	struct rt715_priv *rt715 = dev_get_drvdata(&slave->dev);



	if (rt715->first_hw_init)

	pm_runtime_disable(&slave->dev);



	return 0;

sound/soc/codecs/rt715.c

+24 −13
Original line number Diff line number Diff line
@@ -740,8 +740,12 @@ static int rt715_set_bias_level(struct snd_soc_component *component, 


static int rt715_probe(struct snd_soc_component *component)

{

	struct rt715_priv *rt715 = snd_soc_component_get_drvdata(component);

	int ret;



	if (!rt715->first_hw_init)

		return 0;



	ret = pm_runtime_resume(component->dev);

	if (ret < 0 && ret != -EACCES)

		return ret;
@@ -997,8 +1001,25 @@ int rt715_init(struct device *dev, struct regmap *sdw_regmap, 
						&soc_codec_dev_rt715,

						rt715_dai,

						ARRAY_SIZE(rt715_dai));



	if (ret < 0)

		return ret;



	/* set autosuspend parameters */

	pm_runtime_set_autosuspend_delay(dev, 3000);

	pm_runtime_use_autosuspend(dev);



	/* make sure the device does not suspend immediately */

	pm_runtime_mark_last_busy(dev);



	pm_runtime_enable(dev);



	/* important note: the device is NOT tagged as 'active' and will remain

	 * 'suspended' until the hardware is enumerated/initialized. This is required

	 * to make sure the ASoC framework use of pm_runtime_get_sync() does not silently

	 * fail with -EACCESS because of race conditions between card creation and enumeration

	 */



	return 0;

}



int rt715_io_init(struct device *dev, struct sdw_slave *slave)
@@ -1011,22 +1032,12 @@ int rt715_io_init(struct device *dev, struct sdw_slave *slave) 
	regcache_cache_only(rt715->regmap, false);



	/*

	 * PM runtime is only enabled when a Slave reports as Attached

	 *  PM runtime status is marked as 'active' only when a Slave reports as Attached

	 */

	if (!rt715->first_hw_init) {

		/* set autosuspend parameters */

		pm_runtime_set_autosuspend_delay(&slave->dev, 3000);

		pm_runtime_use_autosuspend(&slave->dev);



	if (!rt715->first_hw_init)

		/* update count of parent 'active' children */

		pm_runtime_set_active(&slave->dev);



		/* make sure the device does not suspend immediately */

		pm_runtime_mark_last_busy(&slave->dev);



		pm_runtime_enable(&slave->dev);

	}



	pm_runtime_get_noresume(&slave->dev);



	/* Mute nid=08h/09h */