From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Tony Lindgren <tony@atomide.com>, <linux-omap@vger.kernel.org>
Cc: Vinod Koul <vinod.koul@intel.com>, <dmaengine@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] dmaengine: ti: omap-dma: Block PM if SDMA is busy to fix audio
Date: Tue, 10 Nov 2020 09:58:56 +0200 [thread overview]
Message-ID: <acf280b4-f34d-cfc6-874c-48843cd54365@ti.com> (raw)
In-Reply-To: <20201109154013.11950-1-tony@atomide.com>
Hi Tony,
On 09/11/2020 17.40, Tony Lindgren wrote:
> We now use cpu_pm for saving and restoring device context for deeper SoC
> idle states. But for omap3, we must also block idle if SDMA is busy.
>
> If we don't block idle when SDMA is busy, we eventually end up saving and
> restoring SDMA register state on PER domain idle while SDMA is active and
> that causes at least audio playback to fail.
Thanks for the fix!
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Vinod: Can you take this for 5.10 as a fix? The off mode got enabled by
default in 5.10-rc1 and audio got broken out of box.
Thanks,
- Péter
> Fixes: 4c74ecf79227 ("dmaengine: ti: omap-dma: Add device tree match data and use it for cpu_pm")
> Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> drivers/dma/ti/omap-dma.c | 37 ++++++++++++++++++++++++-------------
> 1 file changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c
> --- a/drivers/dma/ti/omap-dma.c
> +++ b/drivers/dma/ti/omap-dma.c
> @@ -1522,29 +1522,38 @@ static void omap_dma_free(struct omap_dmadev *od)
> }
> }
>
> +/* Currently used by omap2 & 3 to block deeper SoC idle states */
> +static bool omap_dma_busy(struct omap_dmadev *od)
> +{
> + struct omap_chan *c;
> + int lch = -1;
> +
> + while (1) {
> + lch = find_next_bit(od->lch_bitmap, od->lch_count, lch + 1);
> + if (lch >= od->lch_count)
> + break;
> + c = od->lch_map[lch];
> + if (!c)
> + continue;
> + if (omap_dma_chan_read(c, CCR) & CCR_ENABLE)
> + return true;
> + }
> +
> + return false;
> +}
> +
> /* Currently only used for omap2. For omap1, also a check for lcd_dma is needed */
> static int omap_dma_busy_notifier(struct notifier_block *nb,
> unsigned long cmd, void *v)
> {
> struct omap_dmadev *od;
> - struct omap_chan *c;
> - int lch = -1;
>
> od = container_of(nb, struct omap_dmadev, nb);
>
> switch (cmd) {
> case CPU_CLUSTER_PM_ENTER:
> - while (1) {
> - lch = find_next_bit(od->lch_bitmap, od->lch_count,
> - lch + 1);
> - if (lch >= od->lch_count)
> - break;
> - c = od->lch_map[lch];
> - if (!c)
> - continue;
> - if (omap_dma_chan_read(c, CCR) & CCR_ENABLE)
> - return NOTIFY_BAD;
> - }
> + if (omap_dma_busy(od))
> + return NOTIFY_BAD;
> break;
> case CPU_CLUSTER_PM_ENTER_FAILED:
> case CPU_CLUSTER_PM_EXIT:
> @@ -1595,6 +1604,8 @@ static int omap_dma_context_notifier(struct notifier_block *nb,
>
> switch (cmd) {
> case CPU_CLUSTER_PM_ENTER:
> + if (omap_dma_busy(od))
> + return NOTIFY_BAD;
> omap_dma_context_save(od);
> break;
> case CPU_CLUSTER_PM_ENTER_FAILED:
>
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
next prev parent reply other threads:[~2020-11-10 7:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 15:40 [PATCH] dmaengine: ti: omap-dma: Block PM if SDMA is busy to fix audio Tony Lindgren
2020-11-10 7:58 ` Peter Ujfalusi [this message]
2020-11-10 8:00 ` Peter Ujfalusi
2020-11-10 11:33 ` Tony Lindgren
2020-11-10 12:41 ` Vinod Koul
2020-11-10 12:57 ` Tony Lindgren
2020-11-10 12:44 ` Vinod Koul
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=acf280b4-f34d-cfc6-874c-48843cd54365@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
--cc=vinod.koul@intel.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;
as well as URLs for NNTP newsgroup(s).