From: Biju Das <biju.das.jz@bp.renesas.com> To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org> Cc: Geert Uytterhoeven <geert+renesas@glider.be>, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Pavel Machek <pavel@denx.de>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-renesas-soc@vger.kernel.org" <linux-renesas-soc@vger.kernel.org>, Prabhakar <prabhakar.csengg@gmail.com>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com> Subject: RE: [PATCH v2 3/3] ASoC: sh: rz-ssi: Release the DMA channels in rz_ssi_probe() error path Date: Tue, 26 Apr 2022 13:48:05 +0000 [thread overview] Message-ID: <OS0PR01MB5922BF4F1DB81E97926499E786FB9@OS0PR01MB5922.jpnprd01.prod.outlook.com> (raw) In-Reply-To: <20220426074922.13319-4-prabhakar.mahadev-lad.rj@bp.renesas.com> Hi Lad Prabhakar, Thanks for the patch. > Subject: [PATCH v2 3/3] ASoC: sh: rz-ssi: Release the DMA channels in > rz_ssi_probe() error path > > DMA channels requested by rz_ssi_dma_request() in rz_ssi_probe() were > never released in the error path apart from one place. This patch fixes > this issue by calling rz_ssi_release_dma_channels() in the error path. > > Fixes: 26ac471c5354 ("ASoC: sh: rz-ssi: Add SSI DMAC support") > Reported-by: Pavel Machek <pavel@denx.de> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > v1->v2 > * Dropped devers action and instead called rz_ssi_release_dma_channels() > in the error path. > --- > sound/soc/sh/rz-ssi.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index > d9a684e71ec3..e392de7a262e 100644 > --- a/sound/soc/sh/rz-ssi.c > +++ b/sound/soc/sh/rz-ssi.c > @@ -976,14 +976,18 @@ static int rz_ssi_probe(struct platform_device > *pdev) > > /* Error Interrupt */ > ssi->irq_int = platform_get_irq_byname(pdev, "int_req"); > - if (ssi->irq_int < 0) > + if (ssi->irq_int < 0) { > + rz_ssi_release_dma_channels(ssi); > return ssi->irq_int; > + } > > ret = devm_request_irq(&pdev->dev, ssi->irq_int, &rz_ssi_interrupt, > 0, dev_name(&pdev->dev), ssi); > - if (ret < 0) > + if (ret < 0) { > + rz_ssi_release_dma_channels(ssi); > return dev_err_probe(&pdev->dev, ret, > "irq request error (int_req)\n"); > + } > > if (!rz_ssi_is_dma_enabled(ssi)) { > /* Tx and Rx interrupts (pio only) */ @@ -1011,13 +1015,16 @@ > static int rz_ssi_probe(struct platform_device *pdev) > } > > ssi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); > - if (IS_ERR(ssi->rstc)) > + if (IS_ERR(ssi->rstc)) { > + rz_ssi_release_dma_channels(ssi); > return PTR_ERR(ssi->rstc); > + } May be we could move reset handle get above DMA channel request?? Cheers, Biju > > reset_control_deassert(ssi->rstc); > pm_runtime_enable(&pdev->dev); > ret = pm_runtime_resume_and_get(&pdev->dev); > if (ret < 0) { > + rz_ssi_release_dma_channels(ssi); > pm_runtime_disable(ssi->dev); > reset_control_assert(ssi->rstc); > return dev_err_probe(ssi->dev, ret, "pm_runtime_resume_and_get > failed\n"); > -- > 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Biju Das <biju.das.jz@bp.renesas.com> To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org> Cc: Geert Uytterhoeven <geert+renesas@glider.be>, Pavel Machek <pavel@denx.de>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>, "linux-renesas-soc@vger.kernel.org" <linux-renesas-soc@vger.kernel.org>, Prabhakar <prabhakar.csengg@gmail.com>, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Subject: RE: [PATCH v2 3/3] ASoC: sh: rz-ssi: Release the DMA channels in rz_ssi_probe() error path Date: Tue, 26 Apr 2022 13:48:05 +0000 [thread overview] Message-ID: <OS0PR01MB5922BF4F1DB81E97926499E786FB9@OS0PR01MB5922.jpnprd01.prod.outlook.com> (raw) In-Reply-To: <20220426074922.13319-4-prabhakar.mahadev-lad.rj@bp.renesas.com> Hi Lad Prabhakar, Thanks for the patch. > Subject: [PATCH v2 3/3] ASoC: sh: rz-ssi: Release the DMA channels in > rz_ssi_probe() error path > > DMA channels requested by rz_ssi_dma_request() in rz_ssi_probe() were > never released in the error path apart from one place. This patch fixes > this issue by calling rz_ssi_release_dma_channels() in the error path. > > Fixes: 26ac471c5354 ("ASoC: sh: rz-ssi: Add SSI DMAC support") > Reported-by: Pavel Machek <pavel@denx.de> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> > --- > v1->v2 > * Dropped devers action and instead called rz_ssi_release_dma_channels() > in the error path. > --- > sound/soc/sh/rz-ssi.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index > d9a684e71ec3..e392de7a262e 100644 > --- a/sound/soc/sh/rz-ssi.c > +++ b/sound/soc/sh/rz-ssi.c > @@ -976,14 +976,18 @@ static int rz_ssi_probe(struct platform_device > *pdev) > > /* Error Interrupt */ > ssi->irq_int = platform_get_irq_byname(pdev, "int_req"); > - if (ssi->irq_int < 0) > + if (ssi->irq_int < 0) { > + rz_ssi_release_dma_channels(ssi); > return ssi->irq_int; > + } > > ret = devm_request_irq(&pdev->dev, ssi->irq_int, &rz_ssi_interrupt, > 0, dev_name(&pdev->dev), ssi); > - if (ret < 0) > + if (ret < 0) { > + rz_ssi_release_dma_channels(ssi); > return dev_err_probe(&pdev->dev, ret, > "irq request error (int_req)\n"); > + } > > if (!rz_ssi_is_dma_enabled(ssi)) { > /* Tx and Rx interrupts (pio only) */ @@ -1011,13 +1015,16 @@ > static int rz_ssi_probe(struct platform_device *pdev) > } > > ssi->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); > - if (IS_ERR(ssi->rstc)) > + if (IS_ERR(ssi->rstc)) { > + rz_ssi_release_dma_channels(ssi); > return PTR_ERR(ssi->rstc); > + } May be we could move reset handle get above DMA channel request?? Cheers, Biju > > reset_control_deassert(ssi->rstc); > pm_runtime_enable(&pdev->dev); > ret = pm_runtime_resume_and_get(&pdev->dev); > if (ret < 0) { > + rz_ssi_release_dma_channels(ssi); > pm_runtime_disable(ssi->dev); > reset_control_assert(ssi->rstc); > return dev_err_probe(ssi->dev, ret, "pm_runtime_resume_and_get > failed\n"); > -- > 2.25.1
next prev parent reply other threads:[~2022-04-26 13:48 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-26 7:49 [PATCH v2 0/3] ASoC: sh: rz-ssi: Trivial fixes Lad Prabhakar 2022-04-26 7:49 ` Lad Prabhakar 2022-04-26 7:49 ` [PATCH v2 1/3] ASoC: sh: rz-ssi: Drop SSIFSR_TDC and SSIFSR_RDC macros Lad Prabhakar 2022-04-26 7:49 ` Lad Prabhakar 2022-04-26 13:12 ` Geert Uytterhoeven 2022-04-26 13:12 ` Geert Uytterhoeven 2022-04-26 7:49 ` [PATCH v2 2/3] ASoC: sh: rz-ssi: Propagate error codes returned from platform_get_irq_byname() Lad Prabhakar 2022-04-26 7:49 ` Lad Prabhakar 2022-04-26 9:47 ` Sergey Shtylyov 2022-04-26 9:47 ` Sergey Shtylyov 2022-04-26 9:55 ` Lad, Prabhakar 2022-04-26 9:55 ` Lad, Prabhakar 2022-04-26 10:17 ` Sergey Shtylyov 2022-04-26 10:17 ` Sergey Shtylyov 2022-04-26 7:49 ` [PATCH v2 3/3] ASoC: sh: rz-ssi: Release the DMA channels in rz_ssi_probe() error path Lad Prabhakar 2022-04-26 7:49 ` Lad Prabhakar 2022-04-26 13:48 ` Biju Das [this message] 2022-04-26 13:48 ` Biju Das 2022-04-27 22:02 ` [PATCH v2 0/3] ASoC: sh: rz-ssi: Trivial fixes Mark Brown 2022-04-27 22:02 ` Mark Brown
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=OS0PR01MB5922BF4F1DB81E97926499E786FB9@OS0PR01MB5922.jpnprd01.prod.outlook.com \ --to=biju.das.jz@bp.renesas.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=geert+renesas@glider.be \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=nobuhiro1.iwamatsu@toshiba.co.jp \ --cc=pavel@denx.de \ --cc=perex@perex.cz \ --cc=prabhakar.csengg@gmail.com \ --cc=prabhakar.mahadev-lad.rj@bp.renesas.com \ --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: linkBe 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.