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 72EF81A00C1; Tue, 9 Jul 2024 16:22:48 +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=1720542168; cv=none; b=X2yPGf54Jjrr62B5VGkd+K8jYF5i15JAmjhOS+47hdpBOTG0r6I0GQJSm//qpD/syQqz9vv+xO0Xh2ntRpSW0hPijByqbu7+1W81sAu1IrzRpCgDX083O32+yRHHGkxb1rMJgKhZQlIaU5wWFUbdz6xyRWvnFrM1J1roSDHVH6Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720542168; c=relaxed/simple; bh=rtGfYyPv/TFTrfs/KMmT/Q2pM7aCZAl9TO8yktmJtZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=miqMHy/d1INadmUcZwXyofqHRxRBuW9DyY1EmHEFS6BUkTJd2DMdmBqLcxA0MnLPoMRzVWUSeewbaVzNwjgtNSM4aliGrrXmNeiMJ+Mgq3VBMsxtB4nA98Ddd2bRNXsKCGA3Vbqnm/LSFJEH1jBojAtOO7bU6mS+2BTMh4AW6ZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C52uuu7/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C52uuu7/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 120B0C32782; Tue, 9 Jul 2024 16:22:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720542168; bh=rtGfYyPv/TFTrfs/KMmT/Q2pM7aCZAl9TO8yktmJtZ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C52uuu7/gu6vB/2V9qxeEHi8/0P8Zz90WHVLeOIRYPKM0HHLDhEyPYlfG3ycrix3+ UgsJovhF7MA7thQTU6iV/RCQ5tWEZoaA/rWJgPAKoQrelEuh5b6/bz18IVvjWEFFit XEiqsgS2yy+Yyk1GE6qj7xzuosjrnT7GFC2pkfX5FJfoWtL7fOfrDNzOglK4o+1SXa DJMjyEhUYsl70P5XAjbBLLL55n/0527PrJvHth7cxWBFnTNhaZJf61yQ6Fmax0ZoqV 11rB4T21UhhpdV7WczY3ipVCHMab19F+noFvO30lePEYlwjKJ+zCjXUKFP4uwOiAUP ddeKdbmcHcMhQ== 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 6.6 10/33] ASoC: ti: davinci-mcasp: Set min period size using FIFO config Date: Tue, 9 Jul 2024 12:21:36 -0400 Message-ID: <20240709162224.31148-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709162224.31148-1-sashal@kernel.org> References: <20240709162224.31148-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.38 Content-Transfer-Encoding: 8bit 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 a5c2cca38d01a..8c8b2a2f6f862 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1474,10 +1474,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); @@ -1492,6 +1493,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]) @@ -1591,9 +1593,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