[alsa-devel] [PATCH] ASoC: soc-core: don't use soc_find_component() at snd_soc_find_dai()

[Jon Hunter]

On 26/06/2019 02:54, Dmitry Osipenko wrote:
> 26.06.2019 4:40, Kuninori Morimoto пишет:
>> From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
>>
>> commit b9f2e25c599bb ("ASoC: soc-core: use soc_find_component() at
>> snd_soc_find_dai()") used soc_find_component() at snd_soc_find_dai(),
>> but, some CPU driver has CPU component for DAI and Platform component,
>> for example generic DMAEngine component.
>> In such case, CPU component and Platform component have same
>> of_node / name.
>>
>> Here soc_find_component() returns *1st* found component.
>> Thus, we shouldn't use soc_find_component() at snd_soc_find_dai().
>> This patch fixup this it, and add comment to indicate this limitation.
>>
>> Fixes: commit b9f2e25c599bb ("ASoC: soc-core: use soc_find_component() at snd_soc_find_dai()")
>> Reported-by: Dmitry Osipenko <digetx at gmail.com>
>> Reported-by: Jon Hunter <jonathanh at nvidia.com>
>> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
>> ---
>>  sound/soc/soc-core.c | 13 +++++++++++--
>>  1 file changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
>> index 358f1fb..8ccaf63 100644
>> --- a/sound/soc/soc-core.c
>> +++ b/sound/soc/soc-core.c
>> @@ -786,6 +786,14 @@ static struct snd_soc_component *soc_find_component(
>>  
>>  	lockdep_assert_held(&client_mutex);
>>  
>> +	/*
>> +	 * NOTE
>> +	 *
>> +	 * It returns *1st* found component, but some driver
>> +	 * has few components by same of_node/name
>> +	 * ex)
>> +	 *	CPU component and generic DMAEngine component
>> +	 */
>>  	for_each_component(component)
>>  		if (snd_soc_is_matching_component(dlc, component))
>>  			return component;
>> @@ -813,8 +821,9 @@ struct snd_soc_dai *snd_soc_find_dai(
>>  	lockdep_assert_held(&client_mutex);
>>  
>>  	/* Find CPU DAI from registered DAIs */
>> -	component = soc_find_component(dlc);
>> -	if (component) {
>> +	for_each_component(component) {
>> +		if (!snd_soc_is_matching_component(dlc, component))
>> +			continue;
>>  		for_each_component_dais(component, dai) {
>>  			if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)
>>  			    && (!dai->driver->name
>>
> 
> Thank you very much!
> 
> Tested-by: Dmitry Osipenko <digetx at gmail.com>

Tested-by: Jon Hunter <jonathanh at nvidia.com>

Thanks!
Jon

-- 
nvpublic