| Message ID | 1477055928-11712-1-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5faf071d08ddd1c1be66deaa93a09ccf43f5b538 |
| Headers | show |
On Fri, Oct 21, 2016 at 02:18:48PM +0100, Charles Keepax wrote: > Unfortunately, I seem to have missed a case where an IRQ safe spinlock was > required, in samsung_i2s_dai_remove, when I fixed up the other calls in > this patch: > > 316fa9e09ad7 ("ASoC: samsung: Use IRQ safe spin lock calls") > > This causes a lockdep warning when unbinding and rebinding the audio card: > > [ 104.357664] CPU0 CPU1 > [ 104.362174] ---- ---- > [ 104.366692] lock(&(&pri_dai->spinlock)->rlock); > [ 104.371372] local_irq_disable(); > [ 104.377283] lock(&(&substream->self_group.lock)->rlock); > [ 104.385259] lock(&(&pri_dai->spinlock)->rlock); > [ 104.392469] <Interrupt> > [ 104.395072] lock(&(&substream->self_group.lock)->rlock); > [ 104.400710] > [ 104.400710] *** DEADLOCK *** > > Fixes: ce8bcdbb61d9 ("ASoC: samsung: i2s: Protect more registers with a spinlock") > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > --- > sound/soc/samsung/i2s.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
On 10/21/2016 03:18 PM, Charles Keepax wrote: > Unfortunately, I seem to have missed a case where an IRQ safe spinlock was > required, in samsung_i2s_dai_remove, when I fixed up the other calls in > this patch: > > 316fa9e09ad7 ("ASoC: samsung: Use IRQ safe spin lock calls") > > This causes a lockdep warning when unbinding and rebinding the audio card: > > [ 104.357664] CPU0 CPU1 > [ 104.362174] ---- ---- > [ 104.366692] lock(&(&pri_dai->spinlock)->rlock); > [ 104.371372] local_irq_disable(); > [ 104.377283] lock(&(&substream->self_group.lock)->rlock); > [ 104.385259] lock(&(&pri_dai->spinlock)->rlock); > [ 104.392469] <Interrupt> > [ 104.395072] lock(&(&substream->self_group.lock)->rlock); > [ 104.400710] > [ 104.400710] *** DEADLOCK *** > > Fixes: ce8bcdbb61d9 ("ASoC: samsung: i2s: Protect more registers with a spinlock") > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index 7e32cf4..588aa01 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1029,12 +1029,13 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) static int samsung_i2s_dai_remove(struct snd_soc_dai *dai) { struct i2s_dai *i2s = snd_soc_dai_get_drvdata(dai); + unsigned long flags; if (!is_secondary(i2s)) { if (i2s->quirks & QUIRK_NEED_RSTCLR) { - spin_lock(i2s->lock); + spin_lock_irqsave(i2s->lock, flags); writel(0, i2s->addr + I2SCON); - spin_unlock(i2s->lock); + spin_unlock_irqrestore(i2s->lock, flags); } }
Unfortunately, I seem to have missed a case where an IRQ safe spinlock was required, in samsung_i2s_dai_remove, when I fixed up the other calls in this patch: 316fa9e09ad7 ("ASoC: samsung: Use IRQ safe spin lock calls") This causes a lockdep warning when unbinding and rebinding the audio card: [ 104.357664] CPU0 CPU1 [ 104.362174] ---- ---- [ 104.366692] lock(&(&pri_dai->spinlock)->rlock); [ 104.371372] local_irq_disable(); [ 104.377283] lock(&(&substream->self_group.lock)->rlock); [ 104.385259] lock(&(&pri_dai->spinlock)->rlock); [ 104.392469] <Interrupt> [ 104.395072] lock(&(&substream->self_group.lock)->rlock); [ 104.400710] [ 104.400710] *** DEADLOCK *** Fixes: ce8bcdbb61d9 ("ASoC: samsung: i2s: Protect more registers with a spinlock") Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- sound/soc/samsung/i2s.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)