summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/imx-ssi.h
diff options
context:
space:
mode:
authorOskar Schirmer <oskar@scara.com>2013-11-16 11:52:25 +0400
committerMark Brown <broonie@linaro.org>2013-12-02 15:57:02 +0400
commit3621dbbc27ff347f2e4476013054bab18ebd906c (patch)
tree45e2f8e5a219554f99398169e6d4414ccce60f8b /sound/soc/fsl/imx-ssi.h
parent7e6d18ac7ea1372b462778ff7c416ceaabe71b66 (diff)
downloadlinux-3621dbbc27ff347f2e4476013054bab18ebd906c.tar.xz
ASoC: fsl: imx-ssi: omit ssi counter to avoid harm in unbalanced situation
Unbalanced calls to imx_ssi_trigger() may result in endless SSI activity and thus provoke eternal sound. While on the first glance, the switch statement looks pretty symmetric, the SUSPEND/RESUME pair is not: the suspend case comes along snd_pcm_suspend_all(), which for fsl/imx-pcm-fiq is called only at snd_soc_suspend(), but the resume case originates straight from the SNDRV_PCM_IOCTL_RESUME. This way userland may provoke an unbalanced resume, which might cause the ssi->enabled counter to increase and never return to zero again, so eventually SSI_SCR_SSIEN is never disabled. As the information on whether to enable the SSI or not is contained in the two bits for TE/RE, we save all the software mirroring of hardware state here and simply use the hardware register itself to keep the state of whether someone is currently playing or capturing. This is essentially the same stuff as in sound/soc/fsl/imx-pcm-fiq.c which I send a patch for three days ago. Astonishing enough this highly fragile scheme is used twice in parallel to serve the very same control function, synchronously: Once out of sync you are lost until reboot. Note, that these fixes wont prevent state machine distortion on alsa level to cut sound or the like. It just makes sure we have a chance to synchronise again later on. Signed-off-by: Oskar Schirmer <oskar@scara.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/fsl/imx-ssi.h')
-rw-r--r--sound/soc/fsl/imx-ssi.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-ssi.h b/sound/soc/fsl/imx-ssi.h
index 560c40fc9ebb..be6562365b6a 100644
--- a/sound/soc/fsl/imx-ssi.h
+++ b/sound/soc/fsl/imx-ssi.h
@@ -213,7 +213,6 @@ struct imx_ssi {
int fiq_init;
int dma_init;
- int enabled;
};
#endif /* _IMX_SSI_H */