* (no subject) @ 2010-04-13 14:38 Sascha Hauer 2010-04-13 14:38 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer 2010-04-13 14:38 ` [PATCH 2/2] imx-ssi: increase minimum periods to 4 Sascha Hauer 0 siblings, 2 replies; 7+ messages in thread From: Sascha Hauer @ 2010-04-13 14:38 UTC (permalink / raw) To: alsa-devel; +Cc: Mark Brown, Valentin Longchamp Hi, Here are further fixes for the i.MX ssi driver. Mark, please let me know whether I should combine 1/2 with the patch that actually broke fiq support. Sascha ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function 2010-04-13 14:38 (no subject) Sascha Hauer @ 2010-04-13 14:38 ` Sascha Hauer 2010-04-13 15:36 ` Liam Girdwood 2010-04-13 14:38 ` [PATCH 2/2] imx-ssi: increase minimum periods to 4 Sascha Hauer 1 sibling, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2010-04-13 14:38 UTC (permalink / raw) To: alsa-devel; +Cc: Sascha Hauer, Mark Brown, Valentin Longchamp This causes a deadlock. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/imx/imx-pcm-fiq.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 64df813..4b694d5 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c @@ -41,6 +41,7 @@ struct imx_pcm_runtime_data { struct hrtimer hrt; int poll_time_ns; struct snd_pcm_substream *substream; + atomic_t running; }; static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) @@ -52,6 +53,9 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) struct pt_regs regs; unsigned long delta; + if (!atomic_read(&iprtd->running)) + return HRTIMER_NORESTART; + get_fiq_regs(®s); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) @@ -129,6 +133,7 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + atomic_set(&iprtd->running, 1); hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns), HRTIMER_MODE_REL); if (++fiq_enable == 1) @@ -139,11 +144,11 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - hrtimer_cancel(&iprtd->hrt); + atomic_set(&iprtd->running, 0); + if (--fiq_enable == 0) disable_fiq(imx_pcm_fiq); - break; default: return -EINVAL; @@ -190,6 +195,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream) iprtd->substream = substream; + atomic_set(&iprtd->running, 0); hrtimer_init(&iprtd->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); iprtd->hrt.function = snd_hrtimer_callback; -- 1.7.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function 2010-04-13 14:38 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer @ 2010-04-13 15:36 ` Liam Girdwood 0 siblings, 0 replies; 7+ messages in thread From: Liam Girdwood @ 2010-04-13 15:36 UTC (permalink / raw) To: Sascha Hauer; +Cc: alsa-devel, Mark Brown, Valentin Longchamp On Tue, 2010-04-13 at 16:38 +0200, Sascha Hauer wrote: > This causes a deadlock. > Code looks fine. Can you fixup the commit message, I assume this patch fixes rather than causes the deadlock ? Thanks Liam -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] imx-ssi: increase minimum periods to 4 2010-04-13 14:38 (no subject) Sascha Hauer 2010-04-13 14:38 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer @ 2010-04-13 14:38 ` Sascha Hauer 2010-04-13 15:36 ` Liam Girdwood 1 sibling, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2010-04-13 14:38 UTC (permalink / raw) To: alsa-devel; +Cc: Sascha Hauer, Mark Brown, Valentin Longchamp Currently the notification of elapsed periods is not very exact. Increase minimum periods to 4. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/imx/imx-pcm-fiq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 4b694d5..ecec332 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c @@ -179,7 +179,7 @@ static struct snd_pcm_hardware snd_imx_hardware = { .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, .period_bytes_max = 16 * 1024, - .periods_min = 2, + .periods_min = 4, .periods_max = 255, .fifo_size = 0, }; -- 1.7.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] imx-ssi: increase minimum periods to 4 2010-04-13 14:38 ` [PATCH 2/2] imx-ssi: increase minimum periods to 4 Sascha Hauer @ 2010-04-13 15:36 ` Liam Girdwood 0 siblings, 0 replies; 7+ messages in thread From: Liam Girdwood @ 2010-04-13 15:36 UTC (permalink / raw) To: Sascha Hauer; +Cc: alsa-devel, Mark Brown, Valentin Longchamp On Tue, 2010-04-13 at 16:38 +0200, Sascha Hauer wrote: > Currently the notification of elapsed periods is not very exact. > Increase minimum periods to 4. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > sound/soc/imx/imx-pcm-fiq.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk ^ permalink raw reply [flat|nested] 7+ messages in thread
* imx-ssi fixes @ 2010-04-14 7:17 Sascha Hauer 2010-04-14 7:17 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer 0 siblings, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2010-04-14 7:17 UTC (permalink / raw) To: alsa-devel; +Cc: Mark Brown, Valentin Longchamp Just a resend of the patches I sent yesterday with an updated commit message. Sascha ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function 2010-04-14 7:17 imx-ssi fixes Sascha Hauer @ 2010-04-14 7:17 ` Sascha Hauer 2010-04-14 7:41 ` Liam Girdwood 0 siblings, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2010-04-14 7:17 UTC (permalink / raw) To: alsa-devel; +Cc: Sascha Hauer, Mark Brown, Valentin Longchamp Doing so causes a deadlock, so just signal the timer to stop using an atomic variable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- sound/soc/imx/imx-pcm-fiq.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c index 2646e05..24670ee 100644 --- a/sound/soc/imx/imx-pcm-fiq.c +++ b/sound/soc/imx/imx-pcm-fiq.c @@ -42,6 +42,7 @@ struct imx_pcm_runtime_data { struct hrtimer hrt; int poll_time_ns; struct snd_pcm_substream *substream; + atomic_t running; }; static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) @@ -53,6 +54,9 @@ static enum hrtimer_restart snd_hrtimer_callback(struct hrtimer *hrt) struct pt_regs regs; unsigned long delta; + if (!atomic_read(&iprtd->running)) + return HRTIMER_NORESTART; + get_fiq_regs(®s); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) @@ -130,6 +134,7 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + atomic_set(&iprtd->running, 1); hrtimer_start(&iprtd->hrt, ns_to_ktime(iprtd->poll_time_ns), HRTIMER_MODE_REL); if (++fiq_enable == 1) @@ -140,11 +145,11 @@ static int snd_imx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - hrtimer_cancel(&iprtd->hrt); + atomic_set(&iprtd->running, 0); + if (--fiq_enable == 0) disable_fiq(imx_pcm_fiq); - break; default: return -EINVAL; @@ -191,6 +196,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream) iprtd->substream = substream; + atomic_set(&iprtd->running, 0); hrtimer_init(&iprtd->hrt, CLOCK_MONOTONIC, HRTIMER_MODE_REL); iprtd->hrt.function = snd_hrtimer_callback; -- 1.7.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function 2010-04-14 7:17 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer @ 2010-04-14 7:41 ` Liam Girdwood 0 siblings, 0 replies; 7+ messages in thread From: Liam Girdwood @ 2010-04-14 7:41 UTC (permalink / raw) To: Sascha Hauer; +Cc: alsa-devel, Mark Brown, Valentin Longchamp On Wed, 2010-04-14 at 09:17 +0200, Sascha Hauer wrote: > Doing so causes a deadlock, so just signal the timer to stop > using an atomic variable. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-04-14 7:41 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-04-13 14:38 (no subject) Sascha Hauer 2010-04-13 14:38 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer 2010-04-13 15:36 ` Liam Girdwood 2010-04-13 14:38 ` [PATCH 2/2] imx-ssi: increase minimum periods to 4 Sascha Hauer 2010-04-13 15:36 ` Liam Girdwood -- strict thread matches above, loose matches on Subject: below -- 2010-04-14 7:17 imx-ssi fixes Sascha Hauer 2010-04-14 7:17 ` [PATCH 1/2] imx-ssi: do not call hrtimer_disable in trigger function Sascha Hauer 2010-04-14 7:41 ` Liam Girdwood
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).