ASoC: core: Complete support for card rebinding
Subsystems (3)
Cezary Rojewski
maintainerPATCH 1/2 ASoC: core: Complete support for card rebinding
Since commit e894efef9ac7 ("ASoC: core: add support to card rebind") there is a support for card rebind. The support is only partial though. Let's consider the following scenarios both of which aim to enumerate a sound card:
1)
snd_soc_add_component(comp1);
(...)
snd_soc_register_card(card1);2)
snd_soc_register_card(card1);
(...)
snd_soc_add_component(comp1);For the sake of simplicity, let comp1 be the last dependency needed for the card1 to enumerate.
Case 1) will end up succeeding whereas 2) is a certain fail - snd_soc_bind_card() does not honor unbind_card_list so even a non-fatal return code of EPROBE_DEFER will cause the card to collapse. Given the typical usecase of platform_device serving as a card->dev and its probe() ending with:
int carddev_probe(struct platform_device *pdev)
{
(...)
return devm_snd_soc_register_card(dev, card);
}failure to register card triggers device_unbind_cleanup() - really_probe() in dd.c.
To allow for card registration to be deferred while being friendly towards existing users of devm_snd_soc_register_card(), add new card->devres_dev field, and devm_xxx() variants for card registration:
devm_snd_soc_register_deferrable_card() (external) devm_snd_soc_bind_card() (internal)
In essence, if requested, devm_snd_soc_bind_card() replaces snd_soc_bind_card(). The rebind procedure takes care of destroying old devres before attempting the new bind. This makes sure nothing is left hanging if binding fails and card becomes unbound but is still registered to the ASoC framework.
To allow snd_soc_bind_card() to be reused by the deferrable friends, move 'client_mutex' locking to the function's callers and select between devm_xxx and non-devm_xxx variants of snd_soc_bind_card() based on card->devres_dev.
On top of the feature, the refactoring brings two benefits:
a) single lock/unlock of 'client_mutex' in snd_soc_add_component() instead of ambiguous unlock and immediate lock in snd_soc_try_rebind_card()
b) all unbind_card_list manipulations done under 'client_mutex'
--- include/sound/soc.h | 2 + sound/soc/soc-core.c | 100 ++++++++++++++++++++++++++++++----------- sound/soc/soc-devres.c | 7 +++ 3 files changed, 82 insertions(+), 27 deletions(-)
include/sound/soc.h +2 -0
@@ -423,6 +423,7 @@ enum snd_soc_pcm_subclass {int snd_soc_register_card (struct snd_soc_card *card);void snd_soc_unregister_card (struct snd_soc_card *card);int devm_snd_soc_register_card (struct device *dev,struct snd_soc_card *card); +int devm_snd_soc_register_deferrable_card (struct device *dev,struct snd_soc_card *card);#ifdef CONFIG_PM_SLEEP int snd_soc_suspend (struct device *dev);int snd_soc_resume (struct device *dev);
@@ -1087,6 +1088,7 @@ struct snd_soc_card { unsigned int fully_routed:1; unsigned int probed:1; unsigned int component_chaining:1; +struct device *devres_dev;void *drvdata; };
sound/soc/soc-core.c +73 -27
173 lines not on this page · raw message
sound/soc/soc-devres.c +7 -0
@@ -83,6 +83,13 @@ int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card) }EXPORT_SYMBOL_GPL (devm_snd_soc_register_card); +int devm_snd_soc_register_deferrable_card (struct device *dev,struct snd_soc_card *card) +{ + card->devres_dev = dev; +return snd_soc_register_card (card); +} +EXPORT_SYMBOL_GPL (devm_snd_soc_register_deferrable_card); +#ifdef CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM static void devm_dmaengine_pcm_release (struct device *dev,void *res)
Signature · 1 line
2.25.1
Cezary Rojewski
maintainerPATCH 2/2 ASoC: Intel: avs: Permit deferred card registration
Utilize card->deferrable flag to support delayed card enumeration - scenario where snd_soc_register_card() occurs before all the required card components are registered into the framework.
--- sound/soc/intel/avs/boards/da7219.c | 2 +- sound/soc/intel/avs/boards/dmic.c | 2 +- sound/soc/intel/avs/boards/es8336.c | 2 +- sound/soc/intel/avs/boards/hdaudio.c | 2 +- sound/soc/intel/avs/boards/i2s_test.c | 2 +- sound/soc/intel/avs/boards/max98357a.c | 2 +- sound/soc/intel/avs/boards/max98373.c | 2 +- sound/soc/intel/avs/boards/max98927.c | 2 +- sound/soc/intel/avs/boards/nau8825.c | 2 +- sound/soc/intel/avs/boards/pcm3168a.c | 2 +- sound/soc/intel/avs/boards/probe.c | 2 +- sound/soc/intel/avs/boards/rt274.c | 2 +- sound/soc/intel/avs/boards/rt286.c | 2 +- sound/soc/intel/avs/boards/rt298.c | 2 +- sound/soc/intel/avs/boards/rt5514.c | 2 +- sound/soc/intel/avs/boards/rt5663.c | 2 +- sound/soc/intel/avs/boards/rt5682.c | 2 +- sound/soc/intel/avs/boards/ssm4567.c | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-)
sound/soc/intel/avs/boards/da7219.c +1 -1
@@ -256,7 +256,7 @@ static int avs_da7219_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_da7219_driver_ids[] = {
sound/soc/intel/avs/boards/dmic.c +1 -1
@@ -74,7 +74,7 @@ static int avs_dmic_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_dmic_driver_ids[] = {
sound/soc/intel/avs/boards/es8336.c +1 -1
@@ -303,7 +303,7 @@ static int avs_es8336_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_es8336_driver_ids[] = {
sound/soc/intel/avs/boards/hdaudio.c +1 -1
@@ -209,7 +209,7 @@ static int avs_hdaudio_probe(struct platform_device *pdev)if (hda_codec_is_display (codec)) card->late_probe = avs_card_late_probe; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_hdaudio_driver_ids[] = {
sound/soc/intel/avs/boards/i2s_test.c +1 -1
@@ -101,7 +101,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_i2s_test_driver_ids[] = {
sound/soc/intel/avs/boards/max98357a.c +1 -1
@@ -132,7 +132,7 @@ static int avs_max98357a_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_max98357a_driver_ids[] = {
sound/soc/intel/avs/boards/max98373.c +1 -1
@@ -187,7 +187,7 @@ static int avs_max98373_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_max98373_driver_ids[] = {
sound/soc/intel/avs/boards/max98927.c +1 -1
@@ -184,7 +184,7 @@ static int avs_max98927_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_max98927_driver_ids[] = {
sound/soc/intel/avs/boards/nau8825.c +1 -1
@@ -290,7 +290,7 @@ static int avs_nau8825_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_nau8825_driver_ids[] = {
sound/soc/intel/avs/boards/pcm3168a.c +1 -1
@@ -116,7 +116,7 @@ static int avs_pcm3168a_probe(struct platform_device *pdev) card->num_dapm_routes =ARRAY_SIZE (card_routes); card->fully_routed = true; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_pcm3168a_driver_ids[] = {
sound/soc/intel/avs/boards/probe.c +1 -1
@@ -47,7 +47,7 @@ static int avs_probe_mb_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_probe_mb_driver_ids[] = {
sound/soc/intel/avs/boards/rt274.c +1 -1
@@ -254,7 +254,7 @@ static int avs_rt274_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt274_driver_ids[] = {
sound/soc/intel/avs/boards/rt286.c +1 -1
@@ -224,7 +224,7 @@ static int avs_rt286_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt286_driver_ids[] = {
sound/soc/intel/avs/boards/rt298.c +1 -1
@@ -243,7 +243,7 @@ static int avs_rt298_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt298_driver_ids[] = {
sound/soc/intel/avs/boards/rt5514.c +1 -1
@@ -170,7 +170,7 @@ static int avs_rt5514_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt5514_driver_ids[] = {
sound/soc/intel/avs/boards/rt5663.c +1 -1
@@ -242,7 +242,7 @@ static int avs_rt5663_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt5663_driver_ids[] = {
sound/soc/intel/avs/boards/rt5682.c +1 -1
@@ -318,7 +318,7 @@ static int avs_rt5682_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_rt5682_driver_ids[] = {
sound/soc/intel/avs/boards/ssm4567.c +1 -1
@@ -173,7 +173,7 @@ static int avs_ssm4567_probe(struct platform_device *pdev)if (ret)return ret; -return devm_snd_soc_register_card (dev, card); +return devm_snd_soc_register_deferrable_card (dev, card); }static const struct platform_device_id avs_ssm4567_driver_ids[] = {
Signature · 1 line
2.25.1
Mark Brown
maintainerQuoted 11 lines · Cezary Rojewski
Since commit
e894efef9ac7("ASoC: core: add support to card rebind") there is a support for card rebind. The support is only partial though. Let's consider the following scenarios both of which aim to enumerate a sound card:1)
snd_soc_add_component(comp1); (...) snd_soc_register_card(card1);[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: core: Complete support for card rebinding
commit: a3375522bb5e28285cb1845ad5601bf4a581da04
[2/2] ASoC: Intel: avs: Permit deferred card registration
commit: d0e1a832ce60354da2159d4d2b1fa324843622d5All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark