From patchwork Thu Feb 20 16:28:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13984240 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23266200132 for ; Thu, 20 Feb 2025 16:29:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068966; cv=none; b=tpLERNoNjUQGjhVVLQHYiNGBHbDMLDVIuvD6t9VUIMBo4Qt73J/sTUsifkA87eS5Sd028DczEpLcfUwtMhAw7ZHq+rUv+IXsdeX0bPabRYkdVhmtdWBE3wzd255crtcMNw4OOlFxWR7uq2dmBwG24OBQ9ziYAzTRZeZ5A1dtg3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068966; c=relaxed/simple; bh=KxZTxc4fxRw7OMyGGA5HOYd9rCClNlteupN9ItslzT8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tINEOqBnkX2X9GqmewGEW2fiyVsqc/ARa9NfVVkqTtX2PoKnkkHbugs6MmLvn0u4GqmxnnG25FqL5F3aBv8NVecrmzCoIveL8aTbHrP5SSQvYdQRs2BHTSjzuoaK7qJdiigBWYbwjPNi0nfcQhYNPaLVEMaizfDz3FlEQDJtxp8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=qNoIsMas; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="qNoIsMas" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-38f3486062eso972338f8f.0 for ; Thu, 20 Feb 2025 08:29:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740068962; x=1740673762; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xe1FIG0EUV5vtEiip0bMJp8pcyFVOy9gW9Da1yY8B3U=; b=qNoIsMas+gv+WiFlcDibu9VvIfGI5+xGsSynwJ2esMJlNBuWtmvlH1VfpLsa65IePJ 7H4RULnC4Kk4paev3IEV07W738cDLenZO3kAxAe0ls9hwnZ9jS3yf5rFvGFa8jYCpruR rRtmcuJ+71snKr2dvjDMhqj9W+Ifm+MC8wmPDAc1/YdaylvvKF/fGIWdSaoWXtV0uAHt Zbe1YL8yK5Q1nESMwEEuFsVibcwe8ufyuKBGQvwfOvmmz3U+CfbJYwEdS1f/CWfmqMQY 7crhOIXdZtuiIMmXrU3vjiXN7m4Rxln/Lr32G5xW6UchnCXzhZ2fOPninufdycYZcWI9 x+jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068962; x=1740673762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xe1FIG0EUV5vtEiip0bMJp8pcyFVOy9gW9Da1yY8B3U=; b=GSP0c6XXRkTOxon7bJf6O4CcPilOgoGciSaZhW3SxHSysq0FK5Dfbe5zkTo/EBTGyP DFD2X5Rav/Zu0nwczoZCpgms1MehAiR6VwnPwzFaTUkx3OH6boVmTdPXrYSBN+4t7iH/ gedPmRH64P2s4PNG9Y2m6bQV/f7NCbcE+rHnVIKjtbvqoKZNv6JzywrrWyOT50+u8Nzt lRJpTvlZBxReAJCYQR5HPQwfR6Yca56315gLJVR0D+cl9bfQMPnyczrvGcaF8gG5qHdo tF0ld1GGkzJwVzOb00suDLER64FMlfdhM+RPO0TVMkCKIa5sF6zz59zrklvGZRSSg78R Oerg== X-Forwarded-Encrypted: i=1; AJvYcCUNNoNXpFiys8CYMOqf3cHxK7IcX6xEIFWoafL1RvlJBnR5rhlgrw1C2+dJ+qcRjQWz3otSRvH+eaNs5XoK@vger.kernel.org X-Gm-Message-State: AOJu0YxF9IifZa1WqgHYQ7bbCDH51Mcbdz/eyA7uEmDHymqS5A2vb8UO yTm4CXXL8hdBn38ape60tRFkBx9bEGu2CDYAa8KhuZABmk8bWFBI8ystMtyKmE0= X-Gm-Gg: ASbGncsouPzIKbpxclyuG7Pju6ooPd4g1hW9zVSisagSqgrwIoEFOQMlG0mF22oSCvo H3IIpQtPlFna2tPRCKWNXqWm4Amji2ZgmirREL38b9FWiozSFp/L4+vrmK6oNx6eJT5JlADddM5 Re7m9E+sqzAv/FRsxFacblAfsVS/b6MorJbZMxooFytFest0nTK/MvjEixtwUFxneRm13Ii5YCT 0Dd+u/lwIKHj4HezI2n+mh3AshZhlpwP5hse2k9WXATZHPR/mqSD6EfOVseWDJJkMYYP6YZBRQh YFzv3f+hARJbGiK4XvQoW2z2gpv8OrNy653zQrtt X-Google-Smtp-Source: AGHT+IFeFUNS6+fpxgZcJiw03GQfFy8Cu2R2NlAoQdwczmUQmL/WjMlMRJlHB4Ht882oa1KtvLVMLA== X-Received: by 2002:a05:6000:1866:b0:38d:d223:f8e6 with SMTP id ffacd0b85a97d-38f585ea6cfmr7098326f8f.0.1740068962219; Thu, 20 Feb 2025 08:29:22 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258f5fabsm20813753f8f.45.2025.02.20.08.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:29:21 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH v2 1/5] ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs Date: Thu, 20 Feb 2025 16:28:43 +0000 Message-Id: <20250220162847.11994-2-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> References: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Srinivas Kandagatla With the existing code, we are only setting up one period at a time, in a ping-pong buffer style. This triggers lot of underruns in the dsp leading to jitter noise during audio playback. Fix this by scheduling all available periods, this will ensure that the dsp has enough buffer feed and ultimatley fixing the underruns and audio distortion. Fixes: 9b4fe0f1cd79 ("ASoC: qdsp6: audioreach: add q6apm-dai support") Reported-by: Krzysztof Kozlowski Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 33 +++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index c9404b5934c7..eba51e88a297 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -70,6 +70,7 @@ struct q6apm_dai_rtd { unsigned int bytes_received; unsigned int copied_total; uint16_t bits_per_sample; + unsigned int pb_tail; bool next_track; enum stream_state state; struct q6apm_graph *graph; @@ -134,8 +135,6 @@ static void event_handler(uint32_t opcode, uint32_t token, void *payload, void * prtd->pos += prtd->pcm_count; spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); - if (prtd->state == Q6APM_STREAM_RUNNING) - q6apm_write_async(prtd->graph, prtd->pcm_count, 0, 0, 0); break; case APM_CLIENT_EVENT_DATA_READ_DONE: @@ -294,6 +293,31 @@ static int q6apm_dai_prepare(struct snd_soc_component *component, return 0; } +static int q6apm_dai_ack(struct snd_soc_component *component, + struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct q6apm_dai_rtd *prtd = runtime->private_data; + unsigned int tail; + int i, ret = 0, avail_periods; + + tail = runtime->control->appl_ptr/runtime->period_size; + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + avail_periods = tail - prtd->pb_tail; + for (i = 0; i < avail_periods; i++) { + ret = q6apm_write_async(prtd->graph, prtd->pcm_count, 0, 0, 0); + if (ret < 0) { + dev_err(component->dev, "Error queuing playback buffer %d\n", ret); + return ret; + } + prtd->pb_tail++; + } + } + + return ret; +} + static int q6apm_dai_trigger(struct snd_soc_component *component, struct snd_pcm_substream *substream, int cmd) { @@ -305,13 +329,11 @@ static int q6apm_dai_trigger(struct snd_soc_component *component, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - /* start writing buffers for playback only as we already queued capture buffers */ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - ret = q6apm_write_async(prtd->graph, prtd->pcm_count, 0, 0, 0); break; case SNDRV_PCM_TRIGGER_STOP: /* TODO support be handled via SoftPause Module */ prtd->state = Q6APM_STREAM_STOPPED; + prtd->pb_tail = 0; break; case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: @@ -836,6 +858,7 @@ static const struct snd_soc_component_driver q6apm_fe_dai_component = { .hw_params = q6apm_dai_hw_params, .pointer = q6apm_dai_pointer, .trigger = q6apm_dai_trigger, + .ack = q6apm_dai_ack, .compress_ops = &q6apm_dai_compress_ops, .use_dai_pcm_id = true, }; From patchwork Thu Feb 20 16:28:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13984241 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50C18209F3F for ; Thu, 20 Feb 2025 16:29:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068967; cv=none; b=fepWgvlkMgdDmzoLsZe+hm70TL9lRMB4KQtt7/o2Q0WZ/7MnuktjsXQBFu7jGxOiat992MekPDx2erBB16wD1irPyl8kocOorttTGEmQRjed4tKKKRb1l4JAVXtJwRD2OIbn950G0adS29yq2llDyFEh3pPqOjoZh+1qNkOFIGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068967; c=relaxed/simple; bh=jtgmyAUl97OttcegIr//hFBjAziiMMMYiBD7pE3sZEI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PMB7a0feiIF5YBgc2RUoisNHxQ0+GnXzfqRUm3nfiYjgaBZ0NQsMQwUyK3UJxc+84Ar1UBKGstcwqcMqwQfbCLOZjtfZgjnSlRFqoveorAY8peAqgkXgkkJV03luAYP6fZuNSK99iwGtxfjEwXArGWRz7PXUEKkTFqNx0N24V1I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=GMVOe6X+; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="GMVOe6X+" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43984e9cc90so13761895e9.1 for ; Thu, 20 Feb 2025 08:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740068963; x=1740673763; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uMzT+jdHxkf1ujL8A9tZIPDjBjm8GU3C3qT78yn8Ois=; b=GMVOe6X+ksfb2KYw3ulfKjCkKKED2gn/IKcnwOz228HCTzUSw0kU9an9K76kl3UD8Q pva4IsqFLhIahIgFBi2wvBWy9L38D6CT+jLH+Jfyb3cZ96Wu+H2vgZYn0/hYtkAdzvPy zj7vMolV2mYQJdEhremHjCgUgtmBgX7nO7KxAjIldqMDw5vDvdLYB6mbbs192tTQYvQv fr6k90811m8dPN21Lzce46Hj5t8T8oWNjotBNHwQrCnceLmqSNLiTEIx+4qfr1NIuONI L8amp1/tyfHQSjNMAe+zQU1pcUU4Nd0dJHPKRGwLF/gzJ9vVrLaq87G0pGhFsnkTaHBR iM9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068963; x=1740673763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uMzT+jdHxkf1ujL8A9tZIPDjBjm8GU3C3qT78yn8Ois=; b=v1/Sb0fe0lqZDDDSGFenOwcFAsF68K4jjXnvWszDmagqzOtSDkiB12e45ccD0yy4j6 BzZdUvED3t4/ywUpr1ZENTwSr5f1L+hKN4t/GZNubaIWMuD7rEWrcBfvNfmBJRokD1G0 pTA2loxbSpQc+TPaYOsNAhsOplBCU/n3pHstu8DxpHdzK2Dkr+pOVxNJ1lwmYCf+hYzj 41UfnCz1jdGBMSKpNiLsfyqP/Ca5yD9hD19ZRSs/8ZgZIBZIvB2Si+p1TEfDZQPOeZRf myEPArb6B4110MRGyDFh5QH/Qpv8VdoWQg1igwjX0A72uGv9fhmB1Gc4sEFPrKb421H9 AJiQ== X-Forwarded-Encrypted: i=1; AJvYcCVWOxmfh+MjTL8Blm/mcKv8MPJdxFWs+5uUJTju2l/MyP3GvJrk3Y9Ipo5m6ymDOuxDt4Z/TJ3MrtRQwVZB@vger.kernel.org X-Gm-Message-State: AOJu0Yxa/uhLVinrOVokwCW3TryYu574cT3ywi67DKmPr+ezqBHu7gWx tSgH/yuLi4ANcxYWQkleVQwTsJmWt0Dyo0bwbkStnErcx7KF3ST9G7imZbz/zw4= X-Gm-Gg: ASbGnctHal3gzLoySUwUfiIH6d2etNrwR0yAfkehTFSucVt0580qN5pJylhgKWxuYOw ckHolvnlvLZgeIXX9bESdZWgExtknQR072XN04RDaZ/Bk2X1A1EwIHXSqb20+3U9sGIHQLaXFWk Hd2CsRU3C6sauZxrona0Wq8duuqbhDHhk9AHPkxL0JjsxLTVbf5U5RnXIy6T2KaM4kDbh09bku6 hx23ivV/u9SeW7WqZFFsMWiC+hudh2DpyjwsiF+lWyjb7hv2mdK4io64QJA6bzZA1XWksIae3Ep ay6quQSvZJZ48FQVnTa2XZz2mS4SeBI1xxdLOJ0k X-Google-Smtp-Source: AGHT+IFEwnzc4gMpLn2JhX4tSeUOi2UNl4o8mWNSCnBzMlPANfjpmZejT80sXvTiQRWgRNzSUA2rHg== X-Received: by 2002:a5d:4f0d:0:b0:38d:fede:54f8 with SMTP id ffacd0b85a97d-38f615d2048mr3025832f8f.16.1740068963497; Thu, 20 Feb 2025 08:29:23 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258f5fabsm20813753f8f.45.2025.02.20.08.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:29:22 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH v2 2/5] ASoC: q6apm: add q6apm_get_hw_pointer helper Date: Thu, 20 Feb 2025 16:28:44 +0000 Message-Id: <20250220162847.11994-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> References: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Srinivas Kandagatla Implement an helper function in q6apm to be able to read the current hardware pointer for both read and write buffers. This should help q6apm-dai to get the hardware pointer consistently without it doing manual calculation, which could go wrong in some race conditions. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm.c | 18 +++++++++++++++++- sound/soc/qcom/qdsp6/q6apm.h | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6apm.c b/sound/soc/qcom/qdsp6/q6apm.c index 2a2a5bd98110..ca57413cb784 100644 --- a/sound/soc/qcom/qdsp6/q6apm.c +++ b/sound/soc/qcom/qdsp6/q6apm.c @@ -494,6 +494,19 @@ int q6apm_read(struct q6apm_graph *graph) } EXPORT_SYMBOL_GPL(q6apm_read); +int q6apm_get_hw_pointer(struct q6apm_graph *graph, int dir) +{ + struct audioreach_graph_data *data; + + if (dir == SNDRV_PCM_STREAM_PLAYBACK) + data = &graph->rx_data; + else + data = &graph->tx_data; + + return (int)atomic_read(&data->hw_ptr); +} +EXPORT_SYMBOL_GPL(q6apm_get_hw_pointer); + static int graph_callback(struct gpr_resp_pkt *data, void *priv, int op) { struct data_cmd_rsp_rd_sh_mem_ep_data_buffer_done_v2 *rd_done; @@ -520,7 +533,8 @@ static int graph_callback(struct gpr_resp_pkt *data, void *priv, int op) done = data->payload; phys = graph->rx_data.buf[token].phys; mutex_unlock(&graph->lock); - + /* token numbering starts at 0 */ + atomic_set(&graph->rx_data.hw_ptr, token + 1); if (lower_32_bits(phys) == done->buf_addr_lsw && upper_32_bits(phys) == done->buf_addr_msw) { graph->result.opcode = hdr->opcode; @@ -553,6 +567,8 @@ static int graph_callback(struct gpr_resp_pkt *data, void *priv, int op) rd_done = data->payload; phys = graph->tx_data.buf[hdr->token].phys; mutex_unlock(&graph->lock); + /* token numbering starts at 0 */ + atomic_set(&graph->tx_data.hw_ptr, hdr->token + 1); if (upper_32_bits(phys) == rd_done->buf_addr_msw && lower_32_bits(phys) == rd_done->buf_addr_lsw) { diff --git a/sound/soc/qcom/qdsp6/q6apm.h b/sound/soc/qcom/qdsp6/q6apm.h index c248c8d2b1ab..7ce08b401e31 100644 --- a/sound/soc/qcom/qdsp6/q6apm.h +++ b/sound/soc/qcom/qdsp6/q6apm.h @@ -2,6 +2,7 @@ #ifndef __Q6APM_H__ #define __Q6APM_H__ #include +#include #include #include #include @@ -77,6 +78,7 @@ struct audioreach_graph_data { uint32_t num_periods; uint32_t dsp_buf; uint32_t mem_map_handle; + atomic_t hw_ptr; }; struct audioreach_graph { @@ -150,4 +152,5 @@ int q6apm_enable_compress_module(struct device *dev, struct q6apm_graph *graph, int q6apm_remove_initial_silence(struct device *dev, struct q6apm_graph *graph, uint32_t samples); int q6apm_remove_trailing_silence(struct device *dev, struct q6apm_graph *graph, uint32_t samples); int q6apm_set_real_module_id(struct device *dev, struct q6apm_graph *graph, uint32_t codec_id); +int q6apm_get_hw_pointer(struct q6apm_graph *graph, int dir); #endif /* __APM_GRAPH_ */ From patchwork Thu Feb 20 16:28:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13984242 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E89A620DD47 for ; Thu, 20 Feb 2025 16:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068968; cv=none; b=AWJeBRyBLNQbCJz3KcqMRCE9dOCrC5hcE5kOu0givmVcOEntBJA7AfkD+TVfxlL9U22l3tyAcKVfa5um+mUICOIsXU4OamDjYxSnEGBDACdrVncyDRW5+91zcUB1X8Yz+5iSF8P/slz8N9QRLRp9axe0wiLKN/vUMG/zTgS+nXQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068968; c=relaxed/simple; bh=Dr8Rk5o8L7NeOZgA3IT4ksHpO16HjBDqWkL7REEjaPg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SEkg0rjt7XG/Nw44MD2PEkjqHi6YGw4YOXghrMPiAKg/aQ8u6d7XJ8TBS8N7tM2dEJw5ndFSSLCl3FkBG9MHym0oYXlyQ66g5KLrEFNAGFUuFk1klItS7yPWwNivAWFJ/zb71ffd9M465ibV/3IbUvYPNdWNZwtKuSdultolvns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=DNWw/fR9; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="DNWw/fR9" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-38f6287649eso871793f8f.3 for ; Thu, 20 Feb 2025 08:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740068965; x=1740673765; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wWH0fM1NieugYkKcNBWP1cXDL8AX1zdkriiAZTiM3tI=; b=DNWw/fR9h7YMhL+7ngqVD5BHacs5CcUYj2W4UrzJHYdPugU8YEElWgIHNKVzmtNn41 kTA9KLkP4LA7wRY1frSI1O3Q4qAwVvl4orM9fdjZG83hk0lQz64a9xG7MnklpHoXrhuD nnEbs6YmtMEYp8+GWYQCJAtAEjS/isHpvcCpxsKDHrnb7+gJV1g+o3yvPsM/GYna+Iuu DpMX+dj2QU+jvKDshaWTu9P51dhtbs8ijStVrH1ihcavm1VYKJG/sTV7zJEUyAzj35rh P8QOSQuRUkgeNYzgL7Nue0D6sT99oCRfI2rpWsmW3Zrrg/odAXTw58AF1d0u+XfRcd9T mFwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068965; x=1740673765; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wWH0fM1NieugYkKcNBWP1cXDL8AX1zdkriiAZTiM3tI=; b=MFCW++88Uf6EZ17+Isd0VpBEwvQmnXa13siSyC9DcWGuodCayT6BG0XksIrUluByUo BxoCo/G9+Mg27ewY47xW6qmNfsgOCqp0N6c+C49MVghKjPazGKWxqe/a5sTVuwWWwohw 8E+t/Hn5bGNhBxHM5WTSbV4uW3HwXPixP+pR3cEEtLl78tRrO/nfhmeSv2aHW2GuapQm Q9SBdErKgnuTY5zDSU9VHlpvuOGUw+fCqqMyq3Rra6nJez26aS7mBZYRBRbX2f5bV1Pa sdc8n+4mnNbADxQXKDmp2iIb8TShObfAk3jx0fbFFHA8u8jhavAXpdDHwUep5ZDJCkQQ y8xA== X-Forwarded-Encrypted: i=1; AJvYcCUVEd+HS2LWMzoTXySXMU/Zin/viG28OCq3Mw823x1QORgLjTflXsPCfQW5jm+7gLuZvq0Hny1EA4JHS1U4@vger.kernel.org X-Gm-Message-State: AOJu0YxSdKTLtShB1Ttvpkj8lhL693h246R98Iey1fV5ezo1+SfToJrO MeE2rS4cJO7zhs4ShtdNZjtQqYbg7d9rCeNncQf9Rmuu0IuGIl2MvPxMdjH6UPk= X-Gm-Gg: ASbGnctA2og5m2y2DcQFZFW2W3Er+VrPsvgpDeBuGHY19z3uaA7fh7tng5F3abF1umn F0v4+GOXS8+JEfs1sMtsZ9hfo1hr/r8eoQAVyzCUbFaZNXQlUJxGBP11D4gy52mXkJ0UvlgvIO/ iA9CMrym/FqbXAngIRW+XeyOcEkmZHkmNitas3Eo71a7Woooh0NXN/FX1N7/YIg0kl5J75H7Mud RpkVzxUyYCXkops/0ryrHUJMmVK9mrvI1z4JdmA7vSHl1ohamMHES98Lti/VxoA5+oDVbN6bN/7 ezV0gWsZRmh1HUfuBHZXgZysMiJMjEdRbvrbIpHN X-Google-Smtp-Source: AGHT+IHdOwtU9xb0WEouusC4CcaJUMhnzC1yLBW1Y1gMidwn7Gg10mbC9aK40VRIc2odT8xSgLfmSw== X-Received: by 2002:a5d:4641:0:b0:38d:e304:7470 with SMTP id ffacd0b85a97d-38f33f44f3emr20248336f8f.25.1740068965221; Thu, 20 Feb 2025 08:29:25 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258f5fabsm20813753f8f.45.2025.02.20.08.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:29:23 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH v2 3/5] ASoC: q6apm-dai: make use of q6apm_get_hw_pointer Date: Thu, 20 Feb 2025 16:28:45 +0000 Message-Id: <20250220162847.11994-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> References: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Srinivas Kandagatla With the existing code, the buffer position is only reset in pointer callback, which leaves the possiblity of it going over the size of buffer size and reporting incorrect position to userspace. Without this patch, its possible to see errors like: snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536 snd-x1e80100 sound: invalid position: pcmC0D0p:0, pos = 12288, buffer size = 12288, period size = 1536 Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index eba51e88a297..7466fe0c661a 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -64,7 +64,6 @@ struct q6apm_dai_rtd { phys_addr_t phys; unsigned int pcm_size; unsigned int pcm_count; - unsigned int pos; /* Buffer position */ unsigned int periods; unsigned int bytes_sent; unsigned int bytes_received; @@ -124,23 +123,16 @@ static void event_handler(uint32_t opcode, uint32_t token, void *payload, void * { struct q6apm_dai_rtd *prtd = priv; struct snd_pcm_substream *substream = prtd->substream; - unsigned long flags; switch (opcode) { case APM_CLIENT_EVENT_CMD_EOS_DONE: prtd->state = Q6APM_STREAM_STOPPED; break; case APM_CLIENT_EVENT_DATA_WRITE_DONE: - spin_lock_irqsave(&prtd->lock, flags); - prtd->pos += prtd->pcm_count; - spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); break; case APM_CLIENT_EVENT_DATA_READ_DONE: - spin_lock_irqsave(&prtd->lock, flags); - prtd->pos += prtd->pcm_count; - spin_unlock_irqrestore(&prtd->lock, flags); snd_pcm_period_elapsed(substream); if (prtd->state == Q6APM_STREAM_RUNNING) q6apm_read(prtd->graph); @@ -247,7 +239,6 @@ static int q6apm_dai_prepare(struct snd_soc_component *component, } prtd->pcm_count = snd_pcm_lib_period_bytes(substream); - prtd->pos = 0; /* rate and channels are sent to audio driver */ ret = q6apm_graph_media_format_shmem(prtd->graph, &cfg); if (ret < 0) { @@ -450,16 +441,12 @@ static snd_pcm_uframes_t q6apm_dai_pointer(struct snd_soc_component *component, struct snd_pcm_runtime *runtime = substream->runtime; struct q6apm_dai_rtd *prtd = runtime->private_data; snd_pcm_uframes_t ptr; - unsigned long flags; - spin_lock_irqsave(&prtd->lock, flags); - if (prtd->pos == prtd->pcm_size) - prtd->pos = 0; - - ptr = bytes_to_frames(runtime, prtd->pos); - spin_unlock_irqrestore(&prtd->lock, flags); + ptr = q6apm_get_hw_pointer(prtd->graph, substream->stream) * runtime->period_size; + if (ptr) + return ptr - 1; - return ptr; + return 0; } static int q6apm_dai_hw_params(struct snd_soc_component *component, @@ -674,8 +661,6 @@ static int q6apm_dai_compr_set_params(struct snd_soc_component *component, prtd->pcm_size = runtime->fragments * runtime->fragment_size; prtd->bits_per_sample = 16; - prtd->pos = 0; - if (prtd->next_track != true) { memcpy(&prtd->codec, codec, sizeof(*codec)); From patchwork Thu Feb 20 16:28:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13984243 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9AFF6212B02 for ; Thu, 20 Feb 2025 16:29:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068970; cv=none; b=J2tkBWKxD4QEhuqyF37+UWhH0oBuGeZwaxV3qzyzgwFEmiIY1MqpmJ7LbKA9o+Lo8dtW0eAvZuhT97dGTLzKzqXK/OvpjzkLYrdT2k7aIVBzx+oy9Najw2KuLF2hciQkoBsKJPR9oJsMwSym0Dd70MA392a5IU9pttSo3xJ3zCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068970; c=relaxed/simple; bh=/VfHNWugQzZOouS7hKpPuUUlotDhboVqpoBQsz75KJI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Air8OE04yyt9uJeBeH2akCfN75qYSKFFa5xmB8rppLmXBGWFRxSwuFGsif10t8POl8QCYN7OD6ZG1g2gpsrNaM6sRHeKwkDvq6e8kV2lWdwesw7bXq7YD6AF3IpOFXC5ElGuQ7aV/PNDh7CEhl47PuteVqN8zW0xFhbSLAypOrU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=n5mN0vFR; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="n5mN0vFR" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-38f325ddbc2so826418f8f.1 for ; Thu, 20 Feb 2025 08:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740068967; x=1740673767; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kNs8W2h+NxjkcVzoJNbEyvvCSIIo8azfvztr8o7DSmU=; b=n5mN0vFR1IPe65oQy+wbhA8osJ7mkeTeTJNjdDqudAuPm0weqIAeqMdiHBajOO5MVw BkJjvqaJeoDf7/zHNNLBzavmWK0x/uk+aB7vvoFr/TFssJLg0eYd6I4aRD9SO5xGmrKy LAumR0Q9NgNst1iJckuJLQj2jG1ckbcn7IyXXQG1ZBbujCN3g8er2BcHJog7tXAjI5tq c0Do7BFknFGODU2dp6+ObO8PE0HFD1xeJHQEA+lj/HNZJW2TkcILX6voJkE+nIOY5wxo wvzma5b4pTErJhKIAIRTo9NqZ368DWp67wCQL9/C9PhNLoQ3xmu5wMa2DY8Qbn5rq2Ap c63g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068967; x=1740673767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kNs8W2h+NxjkcVzoJNbEyvvCSIIo8azfvztr8o7DSmU=; b=I7EOArpsfysV1j81IUgYQMAdRY6L6Cd9zlO/cRzgWkeemlPZt7GKLrwR4PMHNOQBGT 38eB/nqLelnNbA5Jcikm/xi6cMFK/obFnuthttI6aVCltVxwrsk8FKJkrBXlqzhsVbf7 Hv3t9ToqRcgopKPAIvgW0jNDWqli9him+em1tQXzlvkYdFxKRhR9ES7lljMecFFGnC7a 9+x1MA3MEVRMWRePvIO8bdILly9cu3mAsmiP/1JSQfcJ6quLIujSC1T5PHL+Gf+IOZEV Ojgwv/e0uJZZ+lGB8pR0vlxdcYYI3gNUAyWkn/IUv+HFstXEXtTK8ioK+JUW6R/53m4Y rscw== X-Forwarded-Encrypted: i=1; AJvYcCXPFBfu7JulLG7Z/iSj/9vgOCQYmbl/Rd9OyKdwsSNc40Guh992Sg10qPJiVR18cMKKDdOJMPAJmTrO6S/i@vger.kernel.org X-Gm-Message-State: AOJu0Yxihps602BFna0PY4DRO/LzhEViBoEDjnqZAb5kbmY3NeBZqdWO tmdT3IiBIdqoH3tCl21QTbYXij7CIsN/sIMz+gllTgFF6zazGMHlvm3pbhOCQjA= X-Gm-Gg: ASbGnctMETEvAPNTqqmutY1aH/J4ojjzRVZrpR+DL5Hvuo63f2RafLkXI0TV//aLvqK YDr0Sdq9fd5YQxFbTuOYFHv8SjNSr0a3LQDzvzuDPWJVch8yLu9GjfP9o/0Qt8o6SeeYTr7JHKQ hwEC4tNPyNoneJdN15a/RivGg88l5pH+a4bm3GhanLX5HpaC3R6PmUrqyEb/OhTHfBekpjpPJZW UGj+xrNudcqVgdu+pwXyuX0rIl1irjonIOJfh7iBa1QtC/RM+YUrOYbOGuTxuRIUWddcuM8psRb YYU/9TbizouGhT+LLXlElV+fT833jp6MR3MLpsv8 X-Google-Smtp-Source: AGHT+IHjLSNxeifF/38VMi7dEG8R8mOoiltOqfkJG6DXGhVBYkNfwPD9ab3HxUNuKUZ0XFxpl43IYA== X-Received: by 2002:adf:f3cb:0:b0:38f:2a7f:b6cd with SMTP id ffacd0b85a97d-38f33f3dba5mr15018331f8f.20.1740068966979; Thu, 20 Feb 2025 08:29:26 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258f5fabsm20813753f8f.45.2025.02.20.08.29.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:29:25 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH v2 4/5] ASoC: qdsp6: q6apm-dai: set correct period size Date: Thu, 20 Feb 2025 16:28:46 +0000 Message-Id: <20250220162847.11994-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> References: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Srinivas Kandagatla For some reason we ended up with a period size which is less than 1ms, DSP does not support such a small fragment size. Adjust this to be in the range of 16ms to 32ms. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index 7466fe0c661a..049b91fd7a23 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -21,11 +21,11 @@ #define PLAYBACK_MIN_NUM_PERIODS 2 #define PLAYBACK_MAX_NUM_PERIODS 8 #define PLAYBACK_MAX_PERIOD_SIZE 65536 -#define PLAYBACK_MIN_PERIOD_SIZE 128 -#define CAPTURE_MIN_NUM_PERIODS 2 -#define CAPTURE_MAX_NUM_PERIODS 8 -#define CAPTURE_MAX_PERIOD_SIZE 4096 -#define CAPTURE_MIN_PERIOD_SIZE 320 +#define PLAYBACK_MIN_PERIOD_SIZE 6144 +#define CAPTURE_MIN_NUM_PERIODS PLAYBACK_MIN_NUM_PERIODS +#define CAPTURE_MAX_NUM_PERIODS PLAYBACK_MAX_NUM_PERIODS +#define CAPTURE_MAX_PERIOD_SIZE PLAYBACK_MAX_PERIOD_SIZE +#define CAPTURE_MIN_PERIOD_SIZE PLAYBACK_MIN_PERIOD_SIZE #define BUFFER_BYTES_MAX (PLAYBACK_MAX_NUM_PERIODS * PLAYBACK_MAX_PERIOD_SIZE) #define BUFFER_BYTES_MIN (PLAYBACK_MIN_NUM_PERIODS * PLAYBACK_MIN_PERIOD_SIZE) #define COMPR_PLAYBACK_MAX_FRAGMENT_SIZE (128 * 1024) From patchwork Thu Feb 20 16:28:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 13984244 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6590C213221 for ; Thu, 20 Feb 2025 16:29:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068972; cv=none; b=tvesGI7Dwp8gFrxECbO6x6yeJbMJSPORDEbunqI3biPMZEhZkCy/HJmPD5/mQEwRben3gPax9Mr01c1q53d24GqfmKe0rzlermQGfxCgG7S0Tl4DBBAipiGeDHIZ2OgNjg5j2pZ/sGwyCRZV2xGknXgHWr7xAHUyXZQU4mUeUJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740068972; c=relaxed/simple; bh=G44mzomd17zjRW176IaSow82CVHdPVhJq52qbX/krTc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=F38bwPUnr5KczahMsiDwx2AfhRJCeluAEpld0NVbAOfVbZE+aox2WqgkE+kU4hPqMK2EA/mAFSwQ/jT7w7x1EMPbCfb+VwpeIgOWUsukcTXIodWXILAinL6adGQZIhAPmr9KTsvyWqwRWT1Um1PqFDFkatgDTrM6ndlqzq+pprs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=zE1N0M+m; arc=none smtp.client-ip=209.85.221.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="zE1N0M+m" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f2b7ce319so970574f8f.2 for ; Thu, 20 Feb 2025 08:29:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740068969; x=1740673769; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7m/CTzgrh0AA9xzhVYZwH6Z/AB9cMb21X+WgCPYE0r0=; b=zE1N0M+mcG6yeCVrShQIusxoURBJlTD5R/+EL5iJJCd42rO9aXh8QlISKn09oAZlS8 cfuZOZ46FL/dKy0jV2g1yq01U1RDQD/zt4t843n0+SdmkNtrT08e0aHKh7zGTPJtXwLX L1wJYAhc5cHI+csGZirsREJBWUDOSoGIhB/90u0PnS+w6Lubjz0TZ28u/3YncEB+r1aI ay9GT5GmWW5hhn6loUsx9pvBRrEyUzrA943X9GWhdrLgK3N6tGOQSaCT4lYNFY0XvCAR OaX98jS8UX0PYG0L/nvQLWfi0bU7lj//ommHFy9MpbMyjLJjCG85ifjpu0Ujr9UAgcEV wz8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740068969; x=1740673769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7m/CTzgrh0AA9xzhVYZwH6Z/AB9cMb21X+WgCPYE0r0=; b=Do8oAObzqOa6RY8MA52wP5YonVgITgXVRuZ07SeFYTdlWyjzeFEbAXEKC0DYorfMMA CrwF3M87se21do2qfRqMv7PAxGfzQesjFg1PDNtF7aOktZ6sXFaGQe2Kq51TICEXf1sx ESxKS+AxPZwdLKlSrJebMTqi+GEEIn1b+rSXG8IopDsbeKNQnddgW/9iAbL4fh48xv5M WgeIi9+Suz3Vo9Bk4fPrYGY8e8xIsVRxQzmbdiloJI3nzuZ1k3T9zW59sVfREiMTy9zg X+TwqopakHboUCHaJVZwCPS9P4bi+uDV5YUAnpxp4vt9pUVKsd8UzkEeStg2kDRWNEfO YRZg== X-Forwarded-Encrypted: i=1; AJvYcCVtzvhISnPrqKH52MxIGkf78qMTCMTcfM6ytPS5l9P6FMjFEK/44t0hp4KfLyT11EV4FP66PzDGVoBmB6dx@vger.kernel.org X-Gm-Message-State: AOJu0YyfwAkyeXiUW8S8r3sTc460U7gdvfXrqFPUDEwT8sE+HiUkrD7F wAAGcJuGX20VjYSc6qBtKkIFdoJ9lIiMOynQSD2uehugJ/s6C+l7XtVw7rZgeco= X-Gm-Gg: ASbGncsjSn4Iq0XINvPk+F8FMEsoznjAVuoRq483crmxrpH1MglIlSqOH2wx1uBNCCD 2l7UncUD2SAr9y3FCCxkVru5FOycs8CjrQBoEo+PjpTaO+zoEVztfqss+8loBtHHsa1V1tjJCTK RUoIqvthXKBgMFIcg39makt0dlqrPdyHwdJXQGOAqLcwTx553OHm17vjYsUUGBl+C3D7Nnp2CyL iGj0YskT5A41njh2X7J7lsHPjZEZmLfBiaQeu2PsQNmcptPw17fNN4natmJhssxmo5aW+CsEmj2 2400j0Ge9hrD544uGMQhdzpClNTw8py4wl9LK+F1 X-Google-Smtp-Source: AGHT+IErNAEoXnEuPGcHDzaI4u+qesPWr2oJ8v0KPpx1eLR4SBNS7L5XLR9zDyZbvaRrA+qYm3ZYUA== X-Received: by 2002:adf:fa86:0:b0:38d:dffc:c144 with SMTP id ffacd0b85a97d-38f587e73a2mr5603019f8f.55.1740068968673; Thu, 20 Feb 2025 08:29:28 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38f258f5fabsm20813753f8f.45.2025.02.20.08.29.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 08:29:27 -0800 (PST) From: srinivas.kandagatla@linaro.org To: broonie@kernel.org Cc: perex@perex.cz, tiwai@suse.com, krzysztof.kozlowski@linaro.org, linux-sound@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.baryshkov@linaro.org, johan+linaro@kernel.org, Srinivas Kandagatla Subject: [PATCH v2 5/5] ASoC: q6apm-dai: remove redundant hw_constraints setup Date: Thu, 20 Feb 2025 16:28:47 +0000 Message-Id: <20250220162847.11994-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> References: <20250220162847.11994-1-srinivas.kandagatla@linaro.org> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Srinivas Kandagatla pcm core already does setup the hw_constraints from struct snd_pcm_hardware values, setting this in q6apm-dai is redundant. Remove the code that sets this. Signed-off-by: Srinivas Kandagatla --- sound/soc/qcom/qdsp6/q6apm-dai.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/sound/soc/qcom/qdsp6/q6apm-dai.c b/sound/soc/qcom/qdsp6/q6apm-dai.c index 049b91fd7a23..b644ce7d394b 100644 --- a/sound/soc/qcom/qdsp6/q6apm-dai.c +++ b/sound/soc/qcom/qdsp6/q6apm-dai.c @@ -374,34 +374,6 @@ static int q6apm_dai_open(struct snd_soc_component *component, else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) runtime->hw = q6apm_dai_hardware_capture; - /* Ensure that buffer size is a multiple of period size */ - ret = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS); - if (ret < 0) { - dev_err(dev, "snd_pcm_hw_constraint_integer failed\n"); - goto err; - } - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - ret = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, - BUFFER_BYTES_MIN, BUFFER_BYTES_MAX); - if (ret < 0) { - dev_err(dev, "constraint for buffer bytes min max ret = %d\n", ret); - goto err; - } - } - - ret = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 32); - if (ret < 0) { - dev_err(dev, "constraint for period bytes step ret = %d\n", ret); - goto err; - } - - ret = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 32); - if (ret < 0) { - dev_err(dev, "constraint for buffer bytes step ret = %d\n", ret); - goto err; - } - runtime->private_data = prtd; runtime->dma_bytes = BUFFER_BYTES_MAX; if (pdata->sid < 0)