From: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
To: Stephen Boyd <swboyd@chromium.org>, <agross@kernel.org>,
<alsa-devel@alsa-project.org>, <bgoswami@codeaurora.org>,
<bjorn.andersson@linaro.org>, <broonie@kernel.org>,
<devicetree@vger.kernel.org>, <judyhsiao@chromium.org>,
<lgirdwood@gmail.com>, <linux-arm-msm@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <perex@perex.cz>,
<quic_plai@quicinc.com>, <robh+dt@kernel.org>,
<rohitkr@codeaurora.org>, <srinivas.kandagatla@linaro.org>,
<tiwai@suse.com>
Cc: Venkata Prasad Potturu <quic_potturu@quicinc.com>
Subject: Re: [RESEND v13 04/10] ASoC: qcom: Add helper function to get dma control and lpaif handle
Date: Wed, 16 Feb 2022 10:41:29 +0530 [thread overview]
Message-ID: <13007276-c827-0cc4-5db1-396c5184bb35@quicinc.com> (raw)
In-Reply-To: <CAE-0n504R0avU9Ybj68jxqDRH-Ya5ro0hPo5GJ=2zC6p2SZ_=g@mail.gmail.com>
On 2/15/2022 6:40 AM, Stephen Boyd wrote:
Thanks for your time Stephen!!!
> Quoting Srinivasa Rao Mandadapu (2022-02-14 06:58:22)
>> Add support function to get dma control and lpaif handle to avoid
>> repeated code in platform driver
>>
>> Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
>> Co-developed-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
>> Signed-off-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
>> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
>> ---
>> sound/soc/qcom/lpass-platform.c | 113 +++++++++++++++++++++++-----------------
>> 1 file changed, 66 insertions(+), 47 deletions(-)
>>
>> diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
>> index a44162c..5d77240 100644
>> --- a/sound/soc/qcom/lpass-platform.c
>> +++ b/sound/soc/qcom/lpass-platform.c
>> @@ -177,6 +177,49 @@ static int lpass_platform_pcmops_close(struct snd_soc_component *component,
>> return 0;
>> }
>>
>> +static void __lpass_get_lpaif_handle(struct snd_pcm_substream *substream,
> const?
Okay. will add const to substream pointer.
>
>> + struct snd_soc_component *component,
> const?
Here const is giving compilation errors in below code.
>
>> + struct lpaif_dmactl **dmactl, int *id, struct regmap **map)
>> +{
>> + struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);
>> + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
>> + struct lpass_data *drvdata = snd_soc_component_get_drvdata(component);
>> + struct snd_pcm_runtime *rt = substream->runtime;
>> + struct lpass_pcm_data *pcm_data = rt->private_data;
>> + struct lpass_variant *v = drvdata->variant;
>> + int dir = substream->stream;
>> + unsigned int dai_id = cpu_dai->driver->id;
>> + struct lpaif_dmactl *l_dmactl = NULL;
>> + struct regmap *l_map = NULL;
>> + int l_id = 0;
>> +
>> + switch (dai_id) {
>> + case MI2S_PRIMARY ... MI2S_QUINARY:
>> + if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
> Please write if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) and
> drop 'dir' local variable.
Okay. will change it.
>
>> + l_id = pcm_data->dma_ch;
>> + l_dmactl = drvdata->rd_dmactl;
>> + } else {
>> + l_dmactl = drvdata->wr_dmactl;
>> + l_id = pcm_data->dma_ch - v->wrdma_channel_start;
>> + }
>> + l_map = drvdata->lpaif_map;
>> + break;
>> + case LPASS_DP_RX:
>> + l_id = pcm_data->dma_ch;
>> + l_dmactl = drvdata->hdmi_rd_dmactl;
>> + l_map = drvdata->hdmiif_map;
>> + break;
>> + default:
>> + break;
>> + }
>> + if (dmactl)
>> + *dmactl = l_dmactl;
>> + if (id)
>> + *id = l_id;
>> + if (map)
>> + *map = l_map;
> Why not 'return 0' here and return -EINVAL in the default case above? Then
> we can skip the checks for !map or !dmactl below and simply bail out if
> it failed with an error value.
Here the check is for input params. some users call for only damctl or
only map.
so check seems mandatory for updating only valid fields. Will remove
default case which may never occurs.
>
>> +}
>> +
>> static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component,
>> struct snd_pcm_substream *substream,
>> struct snd_pcm_hw_params *params)
>> @@ -191,21 +234,15 @@ static int lpass_platform_pcmops_hw_params(struct snd_soc_component *component,
>> unsigned int channels = params_channels(params);
>> unsigned int regval;
>> struct lpaif_dmactl *dmactl;
>> - int id, dir = substream->stream;
>> + int id;
>> int bitwidth;
>> int ret, dma_port = pcm_data->i2s_port + v->dmactl_audif_start;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> - if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
>> - id = pcm_data->dma_ch;
>> - if (dai_id == LPASS_DP_RX)
>> - dmactl = drvdata->hdmi_rd_dmactl;
>> - else
>> - dmactl = drvdata->rd_dmactl;
>> -
>> - } else {
>> - dmactl = drvdata->wr_dmactl;
>> - id = pcm_data->dma_ch - v->wrdma_channel_start;
>> + __lpass_get_lpaif_handle(substream, component, &dmactl, &id, NULL);
>> + if (!dmactl) {
>> + dev_err(soc_runtime->dev, "failed to get dmactl handle\n");
>> + return -EINVAL;
>> }
>>
>> bitwidth = snd_pcm_format_width(format);
>> @@ -350,10 +387,11 @@ static int lpass_platform_pcmops_hw_free(struct snd_soc_component *component,
>> struct regmap *map;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> - if (dai_id == LPASS_DP_RX)
>> - map = drvdata->hdmiif_map;
>> - else
>> - map = drvdata->lpaif_map;
>> + __lpass_get_lpaif_handle(substream, component, NULL, NULL, &map);
>> + if (!map) {
>> + dev_err(soc_runtime->dev, "failed to get dmactl handle\n");
>> + return -EINVAL;
>> + }
>>
>> reg = LPAIF_DMACTL_REG(v, pcm_data->dma_ch, substream->stream, dai_id);
>> ret = regmap_write(map, reg, 0);
>> @@ -379,22 +417,12 @@ static int lpass_platform_pcmops_prepare(struct snd_soc_component *component,
>> int ret, id, ch, dir = substream->stream;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> -
>> ch = pcm_data->dma_ch;
>> - if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
>> - if (dai_id == LPASS_DP_RX) {
>> - dmactl = drvdata->hdmi_rd_dmactl;
>> - map = drvdata->hdmiif_map;
>> - } else {
>> - dmactl = drvdata->rd_dmactl;
>> - map = drvdata->lpaif_map;
>> - }
>>
>> - id = pcm_data->dma_ch;
>> - } else {
>> - dmactl = drvdata->wr_dmactl;
>> - id = pcm_data->dma_ch - v->wrdma_channel_start;
>> - map = drvdata->lpaif_map;
>> + __lpass_get_lpaif_handle(substream, component, &dmactl, &id, &map);
>> + if (!dmactl) {
>> + dev_err(soc_runtime->dev, "failed to get dmactl handle\n");
>> + return -EINVAL;
>> }
>>
>> ret = regmap_write(map, LPAIF_DMABASE_REG(v, ch, dir, dai_id),
>> @@ -444,25 +472,15 @@ static int lpass_platform_pcmops_trigger(struct snd_soc_component *component,
>> struct lpaif_dmactl *dmactl;
>> struct regmap *map;
>> int ret, ch, id;
>> - int dir = substream->stream;
>> unsigned int reg_irqclr = 0, val_irqclr = 0;
>> unsigned int reg_irqen = 0, val_irqen = 0, val_mask = 0;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> ch = pcm_data->dma_ch;
>> - if (dir == SNDRV_PCM_STREAM_PLAYBACK) {
>> - id = pcm_data->dma_ch;
>> - if (dai_id == LPASS_DP_RX) {
>> - dmactl = drvdata->hdmi_rd_dmactl;
>> - map = drvdata->hdmiif_map;
>> - } else {
>> - dmactl = drvdata->rd_dmactl;
>> - map = drvdata->lpaif_map;
>> - }
>> - } else {
>> - dmactl = drvdata->wr_dmactl;
>> - id = pcm_data->dma_ch - v->wrdma_channel_start;
>> - map = drvdata->lpaif_map;
>> + __lpass_get_lpaif_handle(substream, component, &dmactl, &id, &map);
>> + if (!dmactl) {
>> + dev_err(soc_runtime->dev, "failed to get dmactl handle\n");
>> + return -EINVAL;
>> }
>>
>> switch (cmd) {
>> @@ -597,10 +615,11 @@ static snd_pcm_uframes_t lpass_platform_pcmops_pointer(
>> struct regmap *map;
>> unsigned int dai_id = cpu_dai->driver->id;
>>
>> - if (dai_id == LPASS_DP_RX)
>> - map = drvdata->hdmiif_map;
>> - else
>> - map = drvdata->lpaif_map;
>> + __lpass_get_lpaif_handle(substream, component, NULL, NULL, &map);
>> + if (!map) {
>> + dev_err(soc_runtime->dev, "failed to get dmactl handle\n");
>> + return -EINVAL;
>> + }
>>
>> ch = pcm_data->dma_ch;
>>
>> --
>> 2.7.4
>>
next prev parent reply other threads:[~2022-02-16 5:11 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 14:58 [RESEND v13 00/10] Add support for audio on SC7280 based targets Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 01/10] ASoC: qcom: SC7280: Update config for building codec dma drivers Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 02/10] ASoC: qcom: Move lpass_pcm_data structure to lpass header Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 03/10] ASoC: qcom: lpass: Add dma fields for codec dma lpass interface Srinivasa Rao Mandadapu
2022-02-15 1:05 ` Stephen Boyd
2022-02-16 4:58 ` Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 04/10] ASoC: qcom: Add helper function to get dma control and lpaif handle Srinivasa Rao Mandadapu
2022-02-15 1:10 ` Stephen Boyd
2022-02-16 5:11 ` Srinivasa Rao Mandadapu [this message]
2022-02-17 19:41 ` Stephen Boyd
2022-02-19 18:45 ` Srinivasa Rao Mandadapu (Temp)
2022-02-14 14:58 ` [RESEND v13 05/10] ASoC: qcom: Add register definition for codec rddma and wrdma Srinivasa Rao Mandadapu
2022-02-15 1:12 ` Stephen Boyd
2022-02-16 5:14 ` Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 06/10] ASoC: qcom: Add regmap config support for codec dma driver Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 07/10] ASoC: qcom: Add " Srinivasa Rao Mandadapu
2022-02-15 1:27 ` Stephen Boyd
2022-02-16 6:53 ` Srinivasa Rao Mandadapu
2022-02-17 19:50 ` Stephen Boyd
2022-02-16 6:42 ` kernel test robot
2022-02-17 13:14 ` Dan Carpenter
2022-02-14 14:58 ` [RESEND v13 08/10] ASoC: qcom: Add lpass CPU driver for codec dma control Srinivasa Rao Mandadapu
2022-02-15 1:33 ` Stephen Boyd
2022-02-16 9:42 ` Srinivasa Rao Mandadapu
2022-02-17 19:53 ` Stephen Boyd
2022-02-19 18:56 ` Srinivasa Rao Mandadapu (Temp)
2022-02-14 14:58 ` [RESEND v13 09/10] ASoC: dt-bindings: Add SC7280 lpass cpu bindings Srinivasa Rao Mandadapu
2022-02-14 14:58 ` [RESEND v13 10/10] ASoC: qcom: lpass-sc7280: Add platform driver for lpass audio Srinivasa Rao Mandadapu
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=13007276-c827-0cc4-5db1-396c5184bb35@quicinc.com \
--to=quic_srivasam@quicinc.com \
--cc=agross@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=judyhsiao@chromium.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=quic_plai@quicinc.com \
--cc=quic_potturu@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=rohitkr@codeaurora.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=swboyd@chromium.org \
--cc=tiwai@suse.com \
/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