From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, timur@kernel.org,
Xiubo.Lee@gmail.com, linuxppc-dev@lists.ozlabs.org,
tiwai@suse.com, lgirdwood@gmail.com, robh+dt@kernel.org,
broonie@kernel.org, festevam@gmail.com,
linux-kernel@vger.kernel.org
Subject: Re: [alsa-devel] [PATCH 2/2] ASoC: fsl_asrc: Add support for imx8qm
Date: Tue, 29 Oct 2019 17:17:56 -0700 [thread overview]
Message-ID: <20191030001756.GA19352@Asurada-Nvidia.nvidia.com> (raw)
In-Reply-To: <1572340629-20702-2-git-send-email-shengjiu.wang@nxp.com>
On Tue, Oct 29, 2019 at 05:17:09PM +0800, Shengjiu Wang wrote:
> There are two asrc module in imx8qm, each module has different
> clock configuration, and the DMA type is EDMA.
>
> So in this patch, we define the new clocks, refine the clock map,
> and include struct fsl_asrc_soc_data for different soc usage.
>
> The EDMA channel is fixed with each dma request, one dma request
> corresponding to one dma channel. So we need to request dma
> channel with dma request of asrc module.
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 91 +++++++++++++++++++++++++++++-------
> sound/soc/fsl/fsl_asrc.h | 65 +++++++++++++++++++++++++-
> sound/soc/fsl/fsl_asrc_dma.c | 39 ++++++++++++----
> 3 files changed, 167 insertions(+), 28 deletions(-)
> diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
> index d6146de9acd2..dbb07a486504 100644
> --- a/sound/soc/fsl/fsl_asrc_dma.c
> +++ b/sound/soc/fsl/fsl_asrc_dma.c
> @@ -199,19 +199,40 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
>
> /* Get DMA request of Back-End */
> tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx");
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request = tmp_data->dma_request;
> - dma_release_channel(tmp_chan);
> + /* tmp_chan may be NULL for it is already allocated by Back-End */
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data)
> + pair->dma_data.dma_request = tmp_data->dma_request;
If this patch is supposed to add a !tmp_chan case for EDMA, we
probably shouldn't mute the !tmp_data case because dma_request
will be NULL, although the code previously didn't have a check
either. I mean we might need to error-out for !tmp_chan. Or...
is this intentional?
> + dma_release_channel(tmp_chan);
> + }
>
> /* Get DMA request of Front-End */
> tmp_chan = fsl_asrc_get_dma_channel(pair, dir);
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request2 = tmp_data->dma_request;
> - pair->dma_data.peripheral_type = tmp_data->peripheral_type;
> - pair->dma_data.priority = tmp_data->priority;
> - dma_release_channel(tmp_chan);
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data) {
Same question here.
> + pair->dma_data.dma_request2 = tmp_data->dma_request;
> + pair->dma_data.peripheral_type =
> + tmp_data->peripheral_type;
> + pair->dma_data.priority = tmp_data->priority;
> + }
> + dma_release_channel(tmp_chan);
> + }
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, timur@kernel.org,
Xiubo.Lee@gmail.com, linuxppc-dev@lists.ozlabs.org,
tiwai@suse.com, lgirdwood@gmail.com, robh+dt@kernel.org,
perex@perex.cz, broonie@kernel.org, festevam@gmail.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] ASoC: fsl_asrc: Add support for imx8qm
Date: Tue, 29 Oct 2019 17:17:56 -0700 [thread overview]
Message-ID: <20191030001756.GA19352@Asurada-Nvidia.nvidia.com> (raw)
In-Reply-To: <1572340629-20702-2-git-send-email-shengjiu.wang@nxp.com>
On Tue, Oct 29, 2019 at 05:17:09PM +0800, Shengjiu Wang wrote:
> There are two asrc module in imx8qm, each module has different
> clock configuration, and the DMA type is EDMA.
>
> So in this patch, we define the new clocks, refine the clock map,
> and include struct fsl_asrc_soc_data for different soc usage.
>
> The EDMA channel is fixed with each dma request, one dma request
> corresponding to one dma channel. So we need to request dma
> channel with dma request of asrc module.
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 91 +++++++++++++++++++++++++++++-------
> sound/soc/fsl/fsl_asrc.h | 65 +++++++++++++++++++++++++-
> sound/soc/fsl/fsl_asrc_dma.c | 39 ++++++++++++----
> 3 files changed, 167 insertions(+), 28 deletions(-)
> diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
> index d6146de9acd2..dbb07a486504 100644
> --- a/sound/soc/fsl/fsl_asrc_dma.c
> +++ b/sound/soc/fsl/fsl_asrc_dma.c
> @@ -199,19 +199,40 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
>
> /* Get DMA request of Back-End */
> tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx");
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request = tmp_data->dma_request;
> - dma_release_channel(tmp_chan);
> + /* tmp_chan may be NULL for it is already allocated by Back-End */
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data)
> + pair->dma_data.dma_request = tmp_data->dma_request;
If this patch is supposed to add a !tmp_chan case for EDMA, we
probably shouldn't mute the !tmp_data case because dma_request
will be NULL, although the code previously didn't have a check
either. I mean we might need to error-out for !tmp_chan. Or...
is this intentional?
> + dma_release_channel(tmp_chan);
> + }
>
> /* Get DMA request of Front-End */
> tmp_chan = fsl_asrc_get_dma_channel(pair, dir);
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request2 = tmp_data->dma_request;
> - pair->dma_data.peripheral_type = tmp_data->peripheral_type;
> - pair->dma_data.priority = tmp_data->priority;
> - dma_release_channel(tmp_chan);
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data) {
Same question here.
> + pair->dma_data.dma_request2 = tmp_data->dma_request;
> + pair->dma_data.peripheral_type =
> + tmp_data->peripheral_type;
> + pair->dma_data.priority = tmp_data->priority;
> + }
> + dma_release_channel(tmp_chan);
> + }
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com>
To: Shengjiu Wang <shengjiu.wang@nxp.com>
Cc: timur@kernel.org, Xiubo.Lee@gmail.com, festevam@gmail.com,
broonie@kernel.org, alsa-devel@alsa-project.org,
lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
robh+dt@kernel.org, mark.rutland@arm.com,
devicetree@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] ASoC: fsl_asrc: Add support for imx8qm
Date: Tue, 29 Oct 2019 17:17:56 -0700 [thread overview]
Message-ID: <20191030001756.GA19352@Asurada-Nvidia.nvidia.com> (raw)
In-Reply-To: <1572340629-20702-2-git-send-email-shengjiu.wang@nxp.com>
On Tue, Oct 29, 2019 at 05:17:09PM +0800, Shengjiu Wang wrote:
> There are two asrc module in imx8qm, each module has different
> clock configuration, and the DMA type is EDMA.
>
> So in this patch, we define the new clocks, refine the clock map,
> and include struct fsl_asrc_soc_data for different soc usage.
>
> The EDMA channel is fixed with each dma request, one dma request
> corresponding to one dma channel. So we need to request dma
> channel with dma request of asrc module.
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
> sound/soc/fsl/fsl_asrc.c | 91 +++++++++++++++++++++++++++++-------
> sound/soc/fsl/fsl_asrc.h | 65 +++++++++++++++++++++++++-
> sound/soc/fsl/fsl_asrc_dma.c | 39 ++++++++++++----
> 3 files changed, 167 insertions(+), 28 deletions(-)
> diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
> index d6146de9acd2..dbb07a486504 100644
> --- a/sound/soc/fsl/fsl_asrc_dma.c
> +++ b/sound/soc/fsl/fsl_asrc_dma.c
> @@ -199,19 +199,40 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
>
> /* Get DMA request of Back-End */
> tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx");
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request = tmp_data->dma_request;
> - dma_release_channel(tmp_chan);
> + /* tmp_chan may be NULL for it is already allocated by Back-End */
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data)
> + pair->dma_data.dma_request = tmp_data->dma_request;
If this patch is supposed to add a !tmp_chan case for EDMA, we
probably shouldn't mute the !tmp_data case because dma_request
will be NULL, although the code previously didn't have a check
either. I mean we might need to error-out for !tmp_chan. Or...
is this intentional?
> + dma_release_channel(tmp_chan);
> + }
>
> /* Get DMA request of Front-End */
> tmp_chan = fsl_asrc_get_dma_channel(pair, dir);
> - tmp_data = tmp_chan->private;
> - pair->dma_data.dma_request2 = tmp_data->dma_request;
> - pair->dma_data.peripheral_type = tmp_data->peripheral_type;
> - pair->dma_data.priority = tmp_data->priority;
> - dma_release_channel(tmp_chan);
> + if (tmp_chan) {
> + tmp_data = tmp_chan->private;
> + if (tmp_data) {
Same question here.
> + pair->dma_data.dma_request2 = tmp_data->dma_request;
> + pair->dma_data.peripheral_type =
> + tmp_data->peripheral_type;
> + pair->dma_data.priority = tmp_data->priority;
> + }
> + dma_release_channel(tmp_chan);
> + }
next prev parent reply other threads:[~2019-10-30 0:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 9:17 [alsa-devel] [PATCH 1/2] ASoC: dt-bindings: fsl_asrc: add compatible string for imx8qm Shengjiu Wang
2019-10-29 9:17 ` Shengjiu Wang
2019-10-29 9:17 ` [alsa-devel] [PATCH 2/2] ASoC: fsl_asrc: Add support " Shengjiu Wang
2019-10-29 9:17 ` Shengjiu Wang
2019-10-30 0:17 ` Nicolin Chen [this message]
2019-10-30 0:17 ` Nicolin Chen
2019-10-30 0:17 ` Nicolin Chen
-- strict thread matches above, loose matches on Subject: below --
2019-10-30 3:20 [alsa-devel] " S.j. Wang
2019-10-30 8:38 ` Nicolin Chen
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=20191030001756.GA19352@Asurada-Nvidia.nvidia.com \
--to=nicoleotsuka@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=shengjiu.wang@nxp.com \
--cc=timur@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.