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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B803EC32771 for ; Sat, 18 Jan 2020 04:02:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74C5C2072B for ; Sat, 18 Jan 2020 04:02:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oJRPpWc8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbgARECQ (ORCPT ); Fri, 17 Jan 2020 23:02:16 -0500 Received: from mail-ot1-f66.google.com ([209.85.210.66]:33273 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726566AbgARECQ (ORCPT ); Fri, 17 Jan 2020 23:02:16 -0500 Received: by mail-ot1-f66.google.com with SMTP id b18so24385645otp.0 for ; Fri, 17 Jan 2020 20:02:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Vb5cyWLJV5ZR0F5iDmlf/8PvEYOZeZfUNSdNGtLvZJI=; b=oJRPpWc86aW8ElClMpbeSmGps0a3/zd+opvvpOkEBC8hVNCtjdLp5PzynS4G4c56BU 3VSWjMLxP2DgfZAY4Ynqq28PxgwynoAx/Ega1iY5vHADe1nx28Ss+oVjWt9i17loT/Tn /hJnGFOj25AP5GZ9CftweA9mgLEHxvhOGHMWu4SjXw7OsNretKxT+LYInNxlwjS8R8tX Kvx6LsE4imBsm/FB7RCiHcxLA7Gd4WNxHPzi9y/zW+G3PDYWzBmvAJI8YG+Bi4dU8j07 3cRGWMsJ6Qcd04JnH4bRW0YK5AQHQQcVmjuz3NgVrXoa9eJdOhYIIChJqAExfXq0gD00 gpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Vb5cyWLJV5ZR0F5iDmlf/8PvEYOZeZfUNSdNGtLvZJI=; b=jUOc7TXxZdnGcMRNd0aDSNzRtCd/TRHXd6zl7cTabi974MG+nMHJAgSJUirsPRqqzR eN4N08I/98kpE+SnQI++tbCgWxTeH2XycovDrThxBpF491jciFIEvsTe8yl7+gjQese2 rpGG2qz0zsr4WttHc4VFFVcYWuWjGw6c3q4NrDZoMPFxcH+FOG4HdNARLUnGHfKwaK0T RISDo9F2ScsxHKuuUj177hRujFB4tkcw/rRY//1gmBLwt0VV+Zn3p0KJHjoHpdk5pQaT Q7JYBTVF68yuvct+fjGclelXIQzOeNWusMvR5Ig0BM1c/chfUMgJzq9NiZJnO93vYW04 ninw== X-Gm-Message-State: APjAAAXJ0HpSFXJeo4aGG98+s8rCLpA04KGYQptPhQjnYeMxL1AttU8O aSlk6Yoa2mCu7ifHU8XoQLEtGI420b/XgELxaczdLg== X-Google-Smtp-Source: APXvYqxzZjCff57xw2STewj8hvzXGMNapCy6Befwm57vvCLoE09f+Ii81TVHsJjBeSvPmeIU9AkG5ERsKsyGqT2FA8Q= X-Received: by 2002:a9d:66ca:: with SMTP id t10mr8495244otm.352.1579320135542; Fri, 17 Jan 2020 20:02:15 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: John Stultz Date: Fri, 17 Jan 2020 20:02:04 -0800 Message-ID: Subject: Re: [alsa-devel] [PATCH V6 3/4] ASoC: pcm_dmaengine: Extract snd_dmaengine_pcm_refine_runtime_hwparams To: Shengjiu Wang Cc: Shengjiu Wang , Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Linux-ALSA , Lars-Peter Clausen , Timur Tabi , Xiubo Li , linuxppc-dev@lists.ozlabs.org, Takashi Iwai , Liam Girdwood , Rob Herring , Nicolin Chen , Mark Brown , Fabio Estevam , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Thu, Jan 16, 2020 at 11:11 PM Shengjiu Wang wrote: > > Hi > > On Thu, Jan 16, 2020 at 1:56 PM John Stultz wrote: > > > > On Wed, Jan 8, 2020 at 8:58 PM John Stultz wrote: > > > On Thu, Sep 26, 2019 at 6:50 PM Shengjiu Wang wrote: > > > > > > > > When set the runtime hardware parameters, we may need to query > > > > the capability of DMA to complete the parameters. > > > > > > > > This patch is to Extract this operation from > > > > dmaengine_pcm_set_runtime_hwparams function to a separate function > > > > snd_dmaengine_pcm_refine_runtime_hwparams, that other components > > > > which need this feature can call this function. > > > > > > > > Signed-off-by: Shengjiu Wang > > > > Reviewed-by: Nicolin Chen > > > > > > As a heads up, this patch seems to be causing a regression on the HiKey board. > > > > > > On boot up I'm seeing: > > > [ 17.721424] hi6210_i2s f7118000.i2s: ASoC: can't open component > > > f7118000.i2s: -6 > > > > > > And HDMI audio isn't working. With this patch reverted, audio works again. > > > > > > > > > > diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c > > > > index 89a05926ac73..5749a8a49784 100644 > > > > --- a/sound/core/pcm_dmaengine.c > > > > +++ b/sound/core/pcm_dmaengine.c > > > > @@ -369,4 +369,87 @@ int snd_dmaengine_pcm_close_release_chan(struct snd_pcm_substream *substream) > > > ... > > > > + ret = dma_get_slave_caps(chan, &dma_caps); > > > > + if (ret == 0) { > > > > + if (dma_caps.cmd_pause && dma_caps.cmd_resume) > > > > + hw->info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME; > > > > + if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT) > > > > + hw->info |= SNDRV_PCM_INFO_BATCH; > > > > + > > > > + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > > > > + addr_widths = dma_caps.dst_addr_widths; > > > > + else > > > > + addr_widths = dma_caps.src_addr_widths; > > > > + } > > > > > > It seems a failing ret from dma_get_slave_caps() here is being returned... > > > > > > > + > > > > + /* > > > > + * If SND_DMAENGINE_PCM_DAI_FLAG_PACK is set keep > > > > + * hw.formats set to 0, meaning no restrictions are in place. > > > > + * In this case it's the responsibility of the DAI driver to > > > > + * provide the supported format information. > > > > + */ > > > > + if (!(dma_data->flags & SND_DMAENGINE_PCM_DAI_FLAG_PACK)) > > > > + /* > > > > + * Prepare formats mask for valid/allowed sample types. If the > > > > + * dma does not have support for the given physical word size, > > > > + * it needs to be masked out so user space can not use the > > > > + * format which produces corrupted audio. > > > > + * In case the dma driver does not implement the slave_caps the > > > > + * default assumption is that it supports 1, 2 and 4 bytes > > > > + * widths. > > > > + */ > > > > + for (i = SNDRV_PCM_FORMAT_FIRST; i <= SNDRV_PCM_FORMAT_LAST; i++) { > > > > + int bits = snd_pcm_format_physical_width(i); > > > > + > > > > + /* > > > > + * Enable only samples with DMA supported physical > > > > + * widths > > > > + */ > > > > + switch (bits) { > > > > + case 8: > > > > + case 16: > > > > + case 24: > > > > + case 32: > > > > + case 64: > > > > + if (addr_widths & (1 << (bits / 8))) > > > > + hw->formats |= pcm_format_to_bits(i); > > > > + break; > > > > + default: > > > > + /* Unsupported types */ > > > > + break; > > > > + } > > > > + } > > > > + > > > > + return ret; > > > > > > ... down here. > > > > > > Where as in the old code... > > > > > > > diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c > > > > index 748f5f641002..b9f147eaf7c4 100644 > > > > --- a/sound/soc/soc-generic-dmaengine-pcm.c > > > > +++ b/sound/soc/soc-generic-dmaengine-pcm.c > > > > > > > @@ -145,56 +140,12 @@ static int dmaengine_pcm_set_runtime_hwparams(struct snd_pcm_substream *substrea > > > > if (pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) > > > > hw.info |= SNDRV_PCM_INFO_BATCH; > > > > > > > > - ret = dma_get_slave_caps(chan, &dma_caps); > > > > - if (ret == 0) { > > > > - if (dma_caps.cmd_pause && dma_caps.cmd_resume) > > > > - hw.info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME; > > > > - if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT) > > > > - hw.info |= SNDRV_PCM_INFO_BATCH; > > > > - > > > > - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > > > > - addr_widths = dma_caps.dst_addr_widths; > > > > - else > > > > - addr_widths = dma_caps.src_addr_widths; > > > > - } > > > > > > ...the ret from dma_get_slave_caps() checked above, but is not > > > actually returned. > > > > > > Suggestions on how to sort this out? > > > > Just wanted to check in on this, as I'm still seeing this regression with -rc6. > > > Compare with the old code. it seems that we shouldn't check the return value. > > Could you help to test below changes? > > --- a/sound/soc/soc-generic-dmaengine-pcm.c > +++ b/sound/soc/soc-generic-dmaengine-pcm.c > @@ -138,12 +138,10 @@ dmaengine_pcm_set_runtime_hwparams(struct > snd_soc_component *component, > if (pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) > hw.info |= SNDRV_PCM_INFO_BATCH; > > - ret = snd_dmaengine_pcm_refine_runtime_hwparams(substream, > + snd_dmaengine_pcm_refine_runtime_hwparams(substream, > dma_data, > &hw, > chan); > - if (ret) > - return ret; > > return snd_soc_set_runtime_hwparams(substream, &hw); > } Yes, thanks for taking a look at this! Your patch does appear to avoid the regression. (Though you'll want to drop the ret declaration to avoid "warning: unused variable 'ret'" compiler warnings.) thanks -john