From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23637C3DA41 for ; Tue, 9 Jul 2024 16:28:28 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 52163E9A; Tue, 9 Jul 2024 18:28:16 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 52163E9A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1720542506; bh=gH/MLw6JgZoOrm83fJgEFdvIeuiZFVBnZ1489eqVJqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=oFjY8VzVWq/PmmsxJROcfONTE1Gm3N3nPZGDQ8h+CBzelLNJywH7Dpp/n6noEhxaF XD9HuVBoMT8UN3mIsSSAhNwG323lCqIvapxAldHGZSNMQdKafDGS7QDUg77CdGCzHm SgLPBYHnBTE0/xYwTimKak9G75zMvcTk8wBat/B0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 601CBF805C4; Tue, 9 Jul 2024 18:27:14 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 097BCF80614; Tue, 9 Jul 2024 18:27:14 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D7CB2F805FB; Tue, 9 Jul 2024 18:27:09 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 94A6EF80609 for ; Tue, 9 Jul 2024 18:26:25 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 94A6EF80609 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=Wn2OdZK8 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9D2876160D; Tue, 9 Jul 2024 16:26:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28D57C4AF11; Tue, 9 Jul 2024 16:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542384; bh=gH/MLw6JgZoOrm83fJgEFdvIeuiZFVBnZ1489eqVJqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wn2OdZK892V7w1QHOjWRghCxmlluvUBQBU31pJYCaXGQxg7Jc5ZzDl0Ck5BjBi0Hg Azw+O1AoH4GvYWMNC6PgKvgNNIgQRZIPLgKhjAl543+pwET8uExmKGdYmNFYdtvi2u TJ+DveTE4z3/1WY6rhJAp63xoaQbcaLk7Zhm9Mh5eMxtNbEdrrkkxh2yJVCbrvTFwa 1JChxmlIrUJyhRCUz4cPpli4+UM8YH83ibSswNtHtueMflre4hLdVZ0jCf2Uly+BDe TN+M0dOJFOzmMj7VzXM0PsFyTzUyk/73zGIKEMxMeFMARf8UxQfOUejf76Qof3jn88 iGRouCHlFh27A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jai Luthra , Peter Ujfalusi , Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 05/14] ASoC: ti: davinci-mcasp: Set min period size using FIFO config Date: Tue, 9 Jul 2024 12:25:49 -0400 Message-ID: <20240709162612.32988-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162612.32988-1-sashal@kernel.org> References: <20240709162612.32988-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.221 Content-Transfer-Encoding: 8bit Message-ID-Hash: UYXJMYNM74Y756JGDGK26FVD6LIQVVDD X-Message-ID-Hash: UYXJMYNM74Y756JGDGK26FVD6LIQVVDD X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 a6b72ad53b434..61ea444f2018d 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1441,10 +1441,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); @@ -1459,6 +1460,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]) @@ -1558,9 +1560,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