From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: broonie@kernel.org
Cc: vkoul@kernel.org, perex@perex.cz, tiwai@suse.com,
lgirdwood@gmail.com, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org, ckeepax@opensource.cirrus.com,
pierre-louis.bossart@linux.intel.com,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH v3 04/10] ASoC: q6asm: add length to write command token
Date: Mon, 27 Jul 2020 10:38:00 +0100 [thread overview]
Message-ID: <20200727093806.17089-5-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20200727093806.17089-1-srinivas.kandagatla@linaro.org>
Add length to write command packet token so that we can track exactly
how many bytes are consumed by DSP in the command reply.
This is useful in some use-cases where the end of the file/stream
is not aligned with period size.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
sound/soc/qcom/qdsp6/q6asm-dai.c | 4 +++-
sound/soc/qcom/qdsp6/q6asm.c | 7 ++++---
sound/soc/qcom/qdsp6/q6asm.h | 3 +++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c
index 466383b8c20c..5f0e36e23ef3 100644
--- a/sound/soc/qcom/qdsp6/q6asm-dai.c
+++ b/sound/soc/qcom/qdsp6/q6asm-dai.c
@@ -509,6 +509,7 @@ static void compress_event_handler(uint32_t opcode, uint32_t token,
struct snd_compr_stream *substream = prtd->cstream;
unsigned long flags;
uint64_t avail;
+ uint32_t bytes_written;
switch (opcode) {
case ASM_CLIENT_EVENT_CMD_RUN_DONE:
@@ -529,7 +530,8 @@ static void compress_event_handler(uint32_t opcode, uint32_t token,
case ASM_CLIENT_EVENT_DATA_WRITE_DONE:
spin_lock_irqsave(&prtd->lock, flags);
- prtd->copied_total += prtd->pcm_count;
+ bytes_written = token >> ASM_WRITE_TOKEN_LEN_SHIFT;
+ prtd->copied_total += bytes_written;
snd_compr_fragment_elapsed(substream);
if (prtd->state != Q6ASM_STREAM_RUNNING) {
diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c
index d6728304ce6a..205453d1c1fc 100644
--- a/sound/soc/qcom/qdsp6/q6asm.c
+++ b/sound/soc/qcom/qdsp6/q6asm.c
@@ -670,6 +670,7 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,
if (ac->io_mode & ASM_SYNC_IO_MODE) {
phys_addr_t phys;
unsigned long flags;
+ int token = hdr->token & ASM_WRITE_TOKEN_MASK;
spin_lock_irqsave(&ac->lock, flags);
@@ -681,12 +682,12 @@ static int32_t q6asm_stream_callback(struct apr_device *adev,
goto done;
}
- phys = port->buf[hdr->token].phys;
+ phys = port->buf[token].phys;
if (lower_32_bits(phys) != result->opcode ||
upper_32_bits(phys) != result->status) {
dev_err(ac->dev, "Expected addr %pa\n",
- &port->buf[hdr->token].phys);
+ &port->buf[token].phys);
spin_unlock_irqrestore(&ac->lock, flags);
ret = -EINVAL;
goto done;
@@ -1535,7 +1536,7 @@ int q6asm_write_async(struct audio_client *ac, uint32_t stream_id, uint32_t len,
q6asm_add_hdr(ac, &pkt->hdr, pkt_size, false, stream_id);
ab = &port->buf[port->dsp_buf];
- pkt->hdr.token = port->dsp_buf;
+ pkt->hdr.token = port->dsp_buf | (len << ASM_WRITE_TOKEN_LEN_SHIFT);
pkt->hdr.opcode = ASM_DATA_CMD_WRITE_V2;
write->buf_addr_lsw = lower_32_bits(ab->phys);
write->buf_addr_msw = upper_32_bits(ab->phys);
diff --git a/sound/soc/qcom/qdsp6/q6asm.h b/sound/soc/qcom/qdsp6/q6asm.h
index 9ac020c609c6..312a0452dcdf 100644
--- a/sound/soc/qcom/qdsp6/q6asm.h
+++ b/sound/soc/qcom/qdsp6/q6asm.h
@@ -20,6 +20,9 @@
#define ASM_CLIENT_EVENT_CMD_RUN_DONE 0x1008
#define ASM_CLIENT_EVENT_DATA_WRITE_DONE 0x1009
#define ASM_CLIENT_EVENT_DATA_READ_DONE 0x100a
+#define ASM_WRITE_TOKEN_MASK GENMASK(15, 0)
+#define ASM_WRITE_TOKEN_LEN_MASK GENMASK(31, 16)
+#define ASM_WRITE_TOKEN_LEN_SHIFT 16
enum {
LEGACY_PCM_MODE = 0,
--
2.21.0
next prev parent reply other threads:[~2020-07-27 9:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-27 9:37 [PATCH v3 00/10] ASoC: qdsp6: add gapless compressed audio support Srinivas Kandagatla
2020-07-27 9:37 ` [PATCH v3 01/10] ASoC: q6asm: rename misleading session id variable Srinivas Kandagatla
2020-07-27 9:37 ` [PATCH v3 02/10] ASoC: q6asm: make commands specific to streams Srinivas Kandagatla
2020-07-27 9:37 ` [PATCH v3 03/10] ASoC: q6asm: use flags directly from q6asm-dai Srinivas Kandagatla
2020-07-27 9:38 ` Srinivas Kandagatla [this message]
2020-07-27 9:38 ` [PATCH v3 05/10] ASoC: q6asm: add support to remove intial and trailing silence Srinivas Kandagatla
2020-07-27 9:38 ` [PATCH v3 06/10] ASoC: q6asm: add support to gapless flag in q6asm open Srinivas Kandagatla
2020-07-27 9:38 ` [PATCH v3 07/10] ASoC: q6asm-dai: add next track metadata support Srinivas Kandagatla
2020-07-27 9:38 ` [PATCH v3 08/10] ASoC: q6asm-dai: prepare set params to accept profile change Srinivas Kandagatla
2020-07-27 9:38 ` [PATCH v3 09/10] ASoC: q6asm-dai: add gapless support Srinivas Kandagatla
2020-07-27 9:38 ` [PATCH v3 10/10] ASoC: q6asm-dai: add support to copy callback Srinivas Kandagatla
2020-07-27 15:24 ` [PATCH v3 00/10] ASoC: qdsp6: add gapless compressed audio support Pierre-Louis Bossart
2020-07-28 12:02 ` Vinod Koul
2020-08-18 16:55 ` Mark Brown
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=20200727093806.17089-5-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
--cc=vkoul@kernel.org \
/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 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).