From: Doug Anderson <dianders@chromium.org>
To: Judy Hsiao <judyhsiao@chromium.org>
Cc: Mark Brown <broonie@kernel.org>, Taniya Das <tdas@codeaurora.org>,
Rohit kumar <rohitkr@codeaurora.org>,
Banajit Goswami <bgoswami@codeaurora.org>,
Patrick Lai <plai@codeaurora.org>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Srini Kandagatla <srinivas.kandagatla@linaro.org>,
Stephan Gerhold <stephan@gerhold.net>,
Dylan Reid <dgreid@chromium.org>,
Jimmy Cheng-Yi Chiang <cychiang@google.com>,
Judy Hsiao <judyhsiao@google.com>,
Tzung-Bi Shih <tzungbi@chromium.org>,
Stephen Boyd <swboyd@chromium.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS"
<devicetree@vger.kernel.org>,
ALSA Development Mailing List <alsa-devel@alsa-project.org>,
Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Subject: Re: [v5] ASoC: qcom: lpass-cpu: Fix pop noise during audio capture begin
Date: Thu, 3 Jun 2021 15:40:46 -0700 [thread overview]
Message-ID: <CAD=FV=VzBgbhhVQvG+UGD2yaLJkwiq0qQHdFNQ2Ey8RKmV+qTg@mail.gmail.com> (raw)
In-Reply-To: <20210603150830.229423-1-judyhsiao@chromium.org>
Judy,
On Thu, Jun 3, 2021 at 8:08 AM Judy Hsiao <judyhsiao@chromium.org> wrote:
>
> @@ -315,12 +353,54 @@ static int lpass_cpu_daiops_trigger(struct snd_pcm_substream *substream,
> return ret;
> }
>
> +static int lpass_cpu_daiops_prepare(struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct lpass_data *drvdata = snd_soc_dai_get_drvdata(dai);
> + struct lpaif_i2sctl *i2sctl = drvdata->i2sctl;
> + unsigned int id = dai->driver->id;
> + int ret;
> + /*
> + * Ensure lpass BCLK/LRCLK is enabled bit before playback/capture
> + * data flow starts. This allows other codec to have some delay before
> + * the data flow.
> + * (ex: to drop start up pop noise before capture starts).
> + */
nit: there's usually a blank line between the variable declarations
and the first line of code, even if the first line of code is a
comment.
> + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
> + ret = regmap_fields_write(i2sctl->spken, id, LPAIF_I2SCTL_SPKEN_ENABLE);
> + else
> + ret = regmap_fields_write(i2sctl->micen, id, LPAIF_I2SCTL_MICEN_ENABLE);
> +
> + if (ret) {
> + dev_err(dai->dev, "error writing to i2sctl reg: %d\n", ret);
> + return ret;
> + }
> +
> + /*
> + * Check mi2s_was_prepared before enabling BCLK as lpass_cpu_daiops_prepare can
> + * be called multiple times. It's paired with the clk_disable in
> + * lpass_cpu_daiops_shutdown.
> + */
> + if (!drvdata->mi2s_was_prepared[dai->driver->id]) {
> + drvdata->mi2s_was_prepared[dai->driver->id] = true;
> + ret = clk_enable(drvdata->mi2s_bit_clk[id]);
> + if (ret) {
> + dev_err(dai->dev, "error in enabling mi2s bit clk: %d\n", ret);
> + clk_disable(drvdata->mi2s_osr_clk[id]);
Can you explain why this clk_disable() is here? Your function didn't
turn this clock on, so why should it be turning it off in the error
case?
> + drvdata->mi2s_was_prepared[dai->driver->id] = false;
> + return ret;
> + }
Why not put the `drvdata->mi2s_was_prepared[dai->driver->id] = true;`
_after_ you check for errors. Then you don't need to undo it in the
error case. I presume that your prepare() function isn't reentrant and
can't be called at the same time as your shutdown (right?).
Other than that, I don't have any objections to this patch anymore. I
probably won't add a formal "Reviewed-by", though, since I _really_
don't know anything about the issue at hand or the code. I just
stumbled upon this because I was getting the clock splat at bootup. If
someone feels like this needs me to spin up enough to understand /
really review this patch then please yell.
-Doug
prev parent reply other threads:[~2021-06-03 22:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 15:08 [v5] ASoC: qcom: lpass-cpu: Fix pop noise during audio capture begin Judy Hsiao
2021-06-03 22:40 ` Doug Anderson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAD=FV=VzBgbhhVQvG+UGD2yaLJkwiq0qQHdFNQ2Ey8RKmV+qTg@mail.gmail.com' \
--to=dianders@chromium.org \
--cc=agross@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=cychiang@google.com \
--cc=devicetree@vger.kernel.org \
--cc=dgreid@chromium.org \
--cc=judyhsiao@chromium.org \
--cc=judyhsiao@google.com \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=perex@perex.cz \
--cc=plai@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=rohitkr@codeaurora.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=srivasam@codeaurora.org \
--cc=stephan@gerhold.net \
--cc=swboyd@chromium.org \
--cc=tdas@codeaurora.org \
--cc=tiwai@suse.com \
--cc=tzungbi@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).