From patchwork Wed Jul 2 11:29:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 4464961 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6B0E8BEEAA for ; Wed, 2 Jul 2014 11:32:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92166202B8 for ; Wed, 2 Jul 2014 11:32:44 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 58F9F2022A for ; Wed, 2 Jul 2014 11:32:43 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 69FFE2657AB; Wed, 2 Jul 2014 13:32:42 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 9796E2657D4; Wed, 2 Jul 2014 13:30:39 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 12D0B2657D3; Wed, 2 Jul 2014 13:30:38 +0200 (CEST) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by alsa0.perex.cz (Postfix) with ESMTP id 253722651F0 for ; Wed, 2 Jul 2014 13:29:48 +0200 (CEST) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s62BTm6a008057; Wed, 2 Jul 2014 06:29:48 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s62BTmJv008564; Wed, 2 Jul 2014 06:29:48 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Wed, 2 Jul 2014 06:29:47 -0500 Received: from szilva.Elisa (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s62BTV11022576; Wed, 2 Jul 2014 06:29:45 -0500 From: Peter Ujfalusi To: , , , , Mark Brown , Liam Girdwood , , Date: Wed, 2 Jul 2014 14:29:30 +0300 Message-ID: <1404300570-14082-5-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1404300570-14082-1-git-send-email-peter.ujfalusi@ti.com> References: <1404300570-14082-1-git-send-email-peter.ujfalusi@ti.com> MIME-Version: 1.0 Cc: dmaengine@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 4/4] ALSA: pcm_dmaengine: Correct support for 3 physical bytes samples X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP In case of _3LE/_3BE formats the samples are stored in 3 consecutive bytes without padding it to 4 bytes. This means that the DMA needs to be able to support 3 bytes word length in order to read/write the samples from memory correctly. Originally the code treated 24 bits physical length samples as they were 32 bits which leads to corruption when playing or recording audio. In snd_dmaengine_pcm_open() we should check the slave_caps of the dma if it supports DMA_SLAVE_BUSWIDTH_3_BYTES. Based on this information we initialize the runtime->hw.formats: if DMA_SLAVE_BUSWIDTH_3_BYTES is not supported or the slave_caps is not provided by the driver we mask out the 24 bits physical width sample formats so they will be not available for user space to pick. If the DMA_SLAVE_BUSWIDTH_3_BYTES is supported _3LE/_3BE formats will not be masked so later on they can be valid if both CPU and codec dai supports them. Signed-off-by: Peter Ujfalusi --- sound/core/pcm_dmaengine.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index d5611ec80381..519b500c5669 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -72,6 +72,8 @@ int snd_hwparams_to_dma_slave_config(const struct snd_pcm_substream *substream, buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE; else if (bits == 16) buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES; + else if (bits == 24) + buswidth = DMA_SLAVE_BUSWIDTH_3_BYTES; else if (bits <= 32) buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES; else @@ -292,8 +294,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_request_channel); int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, struct dma_chan *chan) { + struct snd_pcm_runtime *runtime = substream->runtime; struct dmaengine_pcm_runtime_data *prtd; - int ret; + struct dma_slave_caps dma_caps; + bool dma_3bytes_supported = false; + u64 fmt_mask = 0; + int i, ret; if (!chan) return -ENXIO; @@ -311,6 +317,37 @@ int snd_dmaengine_pcm_open(struct snd_pcm_substream *substream, substream->runtime->private_data = prtd; + /* + * Prepare formats mask for valid/allowed sample types. If the dma does + * not support 3bytes word size, it needs to be masked out so user space + * can not use the format which produces corrupted audio. + * If the dma driver does not implement get_slave_caps callback, treat + * it as no 3bytes word support. + */ + if (!dma_get_slave_caps(prtd->dma_chan, &dma_caps)) { + u32 addr_widths; + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + addr_widths = dma_caps.dstn_addr_widths; + else + addr_widths = dma_caps.src_addr_widths; + + if (addr_widths & BIT(DMA_SLAVE_BUSWIDTH_3_BYTES)) + dma_3bytes_supported = true; + } + + for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) { + int bits = snd_pcm_format_physical_width(i); + + if (bits == 24 && !dma_3bytes_supported) + fmt_mask |= (1LL << i); + } + + if (runtime->hw.formats) + runtime->hw.formats &= ~fmt_mask; + else + runtime->hw.formats = ~fmt_mask; + return 0; } EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open);