From d53e77a086745032a11284f7e4a5be148d8cce56 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Thu, 30 Jun 2016 17:45:05 +0800 Subject: MLK-12771: ASoC: fsl_asrc: fix dma task timeout issue The test case is one p2p playback + two m2m converter running simultaneously. There are three root cause for this issue: 1. hw_free() of p2p may be called twice in the end, which cause release twice of one pair, if another pair request is called between this two release, there will be issue. 2. In m2m close(), the asrc_priv->pair[i] will be set NULL twice, which is same issue as 1. 3. when output rate is more than eight multiple of input rate for m2m, the last_period_size should be larger. Signed-off-by: Shengjiu Wang --- sound/soc/fsl/fsl_asrc.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sound/soc/fsl/fsl_asrc.h') diff --git a/sound/soc/fsl/fsl_asrc.h b/sound/soc/fsl/fsl_asrc.h index 1fb06410d86f..034d10dc11e9 100644 --- a/sound/soc/fsl/fsl_asrc.h +++ b/sound/soc/fsl/fsl_asrc.h @@ -341,6 +341,7 @@ struct fsl_asrc_pair { * @pair: pair pointers * @channel_bits: width of ASRCNCR register for each pair * @channel_avail: non-occupied channel numbers + * @pair_streams:indicat which substream is running * @asrc_rate: default sample rate for ASoC Back-Ends * @asrc_width: default sample width for ASoC Back-Ends * @regcache_cfg: store register value of REG_ASRCFG @@ -360,6 +361,7 @@ struct fsl_asrc { struct fsl_asrc_pair *pair[ASRC_PAIR_MAX_NUM]; unsigned int channel_bits; unsigned int channel_avail; + unsigned int pair_streams; int asrc_rate; int asrc_width; -- cgit v1.2.3