From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8ADB157A4F; Tue, 23 Jul 2024 18:28:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759324; cv=none; b=qpPmDQdg4TntwIjm5gMIwSlSgTzYEPBiOkFT3Es2xMS5sb1pxo/waeIst6v72qbF9qtw0gv/bHSsmS+FTvtKEYnRQDjhuYVpYRj4yVPSGgsLN0ewsrTScmXZJZmlnr1tT6kuvvCS8CuUjHMOnba4L5RZPAQjlvuMC1aF/wvJhmk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759324; c=relaxed/simple; bh=1O++3sq3J9+6UNd2m7bFHmb9OZKaNbK4/bkRHPsixSk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sM1SyTdiQ7PWdHEz8UkPSBU34NtG7hyCEDiZkOWnTqFHMAZCIgT5pZrcv/TJK3Q80GD0CPARuyxkj4wScDaWU20zJu6h8m3e4rYIJ4jSCk9H4pmxs1KNjMe79MO7AiMac2dJ3oTqmd6hA3GUFAuT4xqgNeU3KY8NMm9GDeLQJYU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PPFp6/E2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PPFp6/E2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CDB9C4AF09; Tue, 23 Jul 2024 18:28:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759323; bh=1O++3sq3J9+6UNd2m7bFHmb9OZKaNbK4/bkRHPsixSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPFp6/E28dup3q9GGe/Rt4Nd6bFHC0SClyAkQRwz+n/E7DYWwGdRe/5h5d9M9kQ/k wNGIGQX7n0Nrkd/HQjAfj3sdyf/s1QMmjLBo3Ir9AvauMeTCwArclTTBas7mhOW9he OiHfCOFJ7oEVrV5U5aXsH8w/H8d9ZTifB6xGn1LA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Peter Ujfalusi , Jai Luthra , Mark Brown , Sasha Levin Subject: [PATCH 6.1 060/105] ASoC: ti: davinci-mcasp: Set min period size using FIFO config Date: Tue, 23 Jul 2024 20:23:37 +0200 Message-ID: <20240723180405.562161328@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180402.490567226@linuxfoundation.org> References: <20240723180402.490567226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jai Luthra [ Upstream commit c5dcf8ab10606e76c1d8a0ec77f27d84a392e874 ] The minimum period size was enforced to 64 as older devices integrating McASP with EDMA used an internal FIFO of 64 samples. With UDMA based platforms this internal McASP FIFO is optional, as the DMA engine internally does some buffering which is already accounted for when registering the platform. So we should read the actual FIFO configuration (txnumevt/rxnumevt) instead of hardcoding frames.min to 64. Acked-by: Peter Ujfalusi Signed-off-by: Jai Luthra Link: https://lore.kernel.org/r/20240611-asoc_next-v3-2-fcfd84b12164@ti.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/ti/davinci-mcasp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 4edf5b27e136b..c6ef8f92b25f1 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1472,10 +1472,11 @@ static int davinci_mcasp_hw_rule_min_periodsize( { struct snd_interval *period_size = hw_param_interval(params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE); + u8 numevt = *((u8 *)rule->private); struct snd_interval frames; snd_interval_any(&frames); - frames.min = 64; + frames.min = numevt; frames.integer = 1; return snd_interval_refine(period_size, &frames); @@ -1490,6 +1491,7 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, u32 max_channels = 0; int i, dir, ret; int tdm_slots = mcasp->tdm_slots; + u8 *numevt; /* Do not allow more then one stream per direction */ if (mcasp->substreams[substream->stream]) @@ -1589,9 +1591,12 @@ static int davinci_mcasp_startup(struct snd_pcm_substream *substream, return ret; } + numevt = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ? + &mcasp->txnumevt : + &mcasp->rxnumevt; snd_pcm_hw_rule_add(substream->runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, - davinci_mcasp_hw_rule_min_periodsize, NULL, + davinci_mcasp_hw_rule_min_periodsize, numevt, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, -1); return 0; -- 2.43.0