• Kuninori Morimoto's avatar
    ASoC: soc-dai: add mark for snd_soc_dai_startup/shutdown() · 00a0b46c
    Kuninori Morimoto authored
    soc_pcm_open() does rollback when failed (A),
    but, it is almost same as soc_pcm_close().
    
    	static int soc_pcm_open(xxx)
    	{
    		...
    		if (ret < 0)
    			goto xxx_err;
    		...
    		return 0;
    
     ^	config_err:
     |		...
     |	rtd_startup_err:
    (A)		...
     |	component_err:
     |		...
     v		return ret;
    	}
    
    The difference is
    soc_pcm_close() is for all dai/component/substream,
    rollback        is for succeeded part only.
    
    This kind of duplicated code can be a hotbed of bugs,
    thus, we want to share soc_pcm_close() and rollback.
    
    Now, soc_pcm_open/close() are handling
    =>	1) snd_soc_dai_startup/shutdown()
    	2) snd_soc_link_startup/shutdown()
    	3) snd_soc_component_module_get/put()
    	4) snd_soc_component_open/close()
    	5) pm_runtime_put/get()
    
    This patch is for 1) snd_soc_dai_startup/shutdown().
    
    The idea of having bit-flag or counter is not enough for this purpose.
    For example if one DAI is used for 2xPlaybacks for some reasons,
    and if 1st Playback was succeeded but 2nd Playback was failed,
    2nd Playback rollback doesn't need to call shutdown.
    But it has succeeded bit-flag or counter via 1st Playback,
    thus, 2nd Playback rollback will call unneeded shutdown.
    And 1st Playback's necessary shutdown will not be called,
    because bit-flag or counter was cleared by wrong 2nd Playback rollback.
    
    To avoid such case, this patch marks substream pointer when startup() was
    succeeded. If rollback needed, it will check rollback flag and marked
    substream pointer.
    
    One note here is that it cares *current* startup() only now.
    but we might want to check *whole* marked substream in the future.
    This patch is using macro named "push/pop", so that it can be easily
    update.
    Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Link: https://lore.kernel.org/r/87lfgubwoc.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    00a0b46c
soc-dapm.c 122 KB