Commit 2da65892 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: sh: fsi: make sure fsi_stream_push/pop access by spin lock

fsi_stream_push/pop might be called in same time.
This patch protect it.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9478e0b6
...@@ -394,7 +394,10 @@ static void fsi_stream_push(struct fsi_priv *fsi, ...@@ -394,7 +394,10 @@ static void fsi_stream_push(struct fsi_priv *fsi,
{ {
struct fsi_stream *io = fsi_get_stream(fsi, is_play); struct fsi_stream *io = fsi_get_stream(fsi, is_play);
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
struct fsi_master *master = fsi_get_master(fsi);
unsigned long flags;
spin_lock_irqsave(&master->lock, flags);
io->substream = substream; io->substream = substream;
io->buff_sample_capa = fsi_frame2sample(fsi, runtime->buffer_size); io->buff_sample_capa = fsi_frame2sample(fsi, runtime->buffer_size);
io->buff_sample_pos = 0; io->buff_sample_pos = 0;
...@@ -402,13 +405,17 @@ static void fsi_stream_push(struct fsi_priv *fsi, ...@@ -402,13 +405,17 @@ static void fsi_stream_push(struct fsi_priv *fsi,
io->period_pos = 0; io->period_pos = 0;
io->oerr_num = -1; /* ignore 1st err */ io->oerr_num = -1; /* ignore 1st err */
io->uerr_num = -1; /* ignore 1st err */ io->uerr_num = -1; /* ignore 1st err */
spin_unlock_irqrestore(&master->lock, flags);
} }
static void fsi_stream_pop(struct fsi_priv *fsi, int is_play) static void fsi_stream_pop(struct fsi_priv *fsi, int is_play)
{ {
struct fsi_stream *io = fsi_get_stream(fsi, is_play); struct fsi_stream *io = fsi_get_stream(fsi, is_play);
struct snd_soc_dai *dai = fsi_get_dai(io->substream); struct snd_soc_dai *dai = fsi_get_dai(io->substream);
struct fsi_master *master = fsi_get_master(fsi);
unsigned long flags;
spin_lock_irqsave(&master->lock, flags);
if (io->oerr_num > 0) if (io->oerr_num > 0)
dev_err(dai->dev, "over_run = %d\n", io->oerr_num); dev_err(dai->dev, "over_run = %d\n", io->oerr_num);
...@@ -423,6 +430,7 @@ static void fsi_stream_pop(struct fsi_priv *fsi, int is_play) ...@@ -423,6 +430,7 @@ static void fsi_stream_pop(struct fsi_priv *fsi, int is_play)
io->period_pos = 0; io->period_pos = 0;
io->oerr_num = 0; io->oerr_num = 0;
io->uerr_num = 0; io->uerr_num = 0;
spin_unlock_irqrestore(&master->lock, flags);
} }
static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, int is_play) static int fsi_get_current_fifo_samples(struct fsi_priv *fsi, int is_play)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment