All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
To: linuxppc-dev@lists.ozlabs.org, alsa-devel@alsa-project.org,
	broonie@opensource.wolfsonmicro.com
Cc: lrg@slimlogic.co.uk
Subject: [PATCH 3/6] ASoC/mpc5200: Improve printk debug output for trigger
Date: Sat, 07 Nov 2009 01:34:18 -0700	[thread overview]
Message-ID: <20091107083410.18908.86509.stgit@angua> (raw)
In-Reply-To: <20091107081631.18908.82921.stgit@angua>

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

 sound/soc/fsl/mpc5200_dma.c |   15 ++++++++++-----
 sound/soc/fsl/mpc5200_dma.h |    1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 4e47586..658e3fa 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -77,6 +77,7 @@ static irqreturn_t psc_dma_bcom_irq_tx(int irq, void *_psc_dma_stream)
 		bcom_retrieve_buffer(s->bcom_task, NULL, NULL);
 
 		s->period_current = (s->period_current+1) % s->runtime->periods;
+		s->period_count++;
 
 		psc_dma_bcom_enqueue_next_buffer(s);
 	}
@@ -101,6 +102,7 @@ static irqreturn_t psc_dma_bcom_irq_rx(int irq, void *_psc_dma_stream)
 		bcom_retrieve_buffer(s->bcom_task, NULL, NULL);
 
 		s->period_current = (s->period_current+1) % s->runtime->periods;
+		s->period_count++;
 
 		psc_dma_bcom_enqueue_next_buffer(s);
 	}
@@ -142,17 +144,17 @@ static int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd)
 	else
 		s = &psc_dma->playback;
 
-	dev_dbg(psc_dma->dev, "psc_dma_trigger(substream=%p, cmd=%i)"
-		" stream_id=%i\n",
-		substream, cmd, substream->pstr->stream);
-
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
+		dev_dbg(psc_dma->dev, "START: stream=%i fbits=%u ps=%u #p=%u\n",
+			substream->pstr->stream, runtime->frame_bits,
+			(int)runtime->period_size, runtime->periods);
 		s->period_bytes = frames_to_bytes(runtime,
 						  runtime->period_size);
 		s->period_next = 0;
 		s->period_current = 0;
 		s->active = 1;
+		s->period_count = 0;
 		s->runtime = runtime;
 
 		/* Fill up the bestcomm bd queue and enable DMA.
@@ -177,6 +179,8 @@ static int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd)
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
+		dev_dbg(psc_dma->dev, "STOP: stream=%i periods_count=%i\n",
+			substream->pstr->stream, s->period_count);
 		s->active = 0;
 
 		spin_lock_irqsave(&psc_dma->lock, flags);
@@ -190,7 +194,8 @@ static int psc_dma_trigger(struct snd_pcm_substream *substream, int cmd)
 		break;
 
 	default:
-		dev_dbg(psc_dma->dev, "invalid command\n");
+		dev_dbg(psc_dma->dev, "unhandled trigger: stream=%i cmd=%i\n",
+			substream->pstr->stream, cmd);
 		return -EINVAL;
 	}
 
diff --git a/sound/soc/fsl/mpc5200_dma.h b/sound/soc/fsl/mpc5200_dma.h
index d9c741b..c6f29e4 100644
--- a/sound/soc/fsl/mpc5200_dma.h
+++ b/sound/soc/fsl/mpc5200_dma.h
@@ -27,6 +27,7 @@ struct psc_dma_stream {
 	int period_next;
 	int period_current;
 	int period_bytes;
+	int period_count;
 };
 
 /**

  parent reply	other threads:[~2009-11-07  8:34 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-07  8:33 [PATCH 0/6] Fixups to MPC5200 ASoC drivers Grant Likely
2009-11-07  8:33 ` [PATCH 1/6] ASoC/mpc5200: Track DMA position by period number instead of bytes Grant Likely
2009-11-07  8:33   ` Grant Likely
2009-11-07 10:35   ` Liam Girdwood
2009-11-07 10:35     ` [alsa-devel] " Liam Girdwood
2009-11-07 16:50     ` Grant Likely
2009-11-07 16:50       ` [alsa-devel] " Grant Likely
2009-11-07  8:34 ` [PATCH 2/6] ASoC/mpc5200: get rid of the appl_ptr tracking nonsense Grant Likely
2009-11-07 12:51   ` Jon Smirl
2009-11-07 12:51     ` Jon Smirl
2009-11-07 13:04     ` Jon Smirl
2009-11-07 13:04       ` Jon Smirl
2009-11-07 18:53       ` Grant Likely
2009-11-07 18:53         ` Grant Likely
2009-11-07 18:51     ` Grant Likely
2009-11-07 18:51       ` Grant Likely
2009-11-07 20:12       ` Mark Brown
2009-11-07 20:12         ` [alsa-devel] " Mark Brown
2009-11-11 16:38         ` Jon Smirl
2009-11-11 16:38           ` Jon Smirl
2009-11-11 18:37           ` Mark Brown
2009-11-11 18:37             ` [alsa-devel] " Mark Brown
2009-11-11 19:24             ` Grant Likely
2009-11-11 19:24               ` [alsa-devel] " Grant Likely
2009-11-11 20:03               ` Mark Brown
2009-11-11 20:03                 ` [alsa-devel] " Mark Brown
2009-11-11 21:34               ` Jon Smirl
2009-11-11 21:34                 ` [alsa-devel] " Jon Smirl
2009-11-11 21:57                 ` Grant Likely
2009-11-11 21:57                   ` Grant Likely
2009-11-11 23:13                   ` Jon Smirl
2009-11-11 23:13                     ` [alsa-devel] " Jon Smirl
2009-11-12 12:10                     ` Mark Brown
2009-11-12 12:10                       ` [alsa-devel] " Mark Brown
2009-11-11 21:26             ` Jon Smirl
2009-11-11 21:26               ` [alsa-devel] " Jon Smirl
2009-11-07  8:34 ` Grant Likely [this message]
2009-11-07  8:34 ` [PATCH 4/6] ASoC/mpc5200: add to_psc_dma_stream() helper Grant Likely
2009-11-07 12:33   ` Mark Brown
2009-11-07 12:33     ` [alsa-devel] " Mark Brown
2009-11-07  8:34 ` [PATCH 5/6] ASoC/mpc5200: fix enable/disable of AC97 slots Grant Likely
2009-11-07  8:34 ` [PATCH 6/6] ASoC/mpc5200: Add fudge factor to value reported by .pointer() Grant Likely
2009-11-07  8:34   ` Grant Likely
2009-11-07 18:11   ` Mark Brown
2009-11-07 18:11     ` [alsa-devel] " Mark Brown
2009-11-07 18:19     ` Grant Likely
2009-11-07 18:19       ` [alsa-devel] " Grant Likely
2009-11-07 19:33       ` Mark Brown
2009-11-07 19:33         ` [alsa-devel] " Mark Brown
2009-11-07 19:46         ` Grant Likely
2009-11-07 19:46           ` [alsa-devel] " Grant Likely
2009-11-07 12:57 ` [PATCH 0/6] Fixups to MPC5200 ASoC drivers Mark Brown
2009-11-07 12:57   ` [alsa-devel] " Mark Brown
2009-11-07 16:52   ` Grant Likely
2009-11-07 16:52     ` [alsa-devel] " Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091107083410.18908.86509.stgit@angua \
    --to=grant.likely@secretlab.ca \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=lrg@slimlogic.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.