From: Arend van Spriel <arend@broadcom.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: vinod.koul@intel.com, dan.j.williams@intel.com,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: Re: [PATCH v2 2/2] dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
Date: Tue, 16 Sep 2014 15:59:27 +0200 [thread overview]
Message-ID: <5418423F.4010007@broadcom.com> (raw)
In-Reply-To: <20140916135649.GF12379@n2100.arm.linux.org.uk>
On 09/16/14 15:56, Russell King - ARM Linux wrote:
> On Tue, Sep 16, 2014 at 04:53:49PM +0300, Peter Ujfalusi wrote:
>> When the audio stream is paused or suspended we stop the sDMA and when it
>> is unpaused/resumed we start the channel without reconfiguring it.
>> The omap_dma_stop() clears the link configuration when we pause the dma, but
>> it is not setting it back on start. This will result only one audio buffer
>> to be played back and the DMA will stop, since the linking is disabled.
>> We need to restore the CLINK_CTRL register in case of resume.
>>
>> Signed-off-by: Peter Ujfalusi<peter.ujfalusi@ti.com>
>
> Both of these patches now look good, thanks. For both:
>
> Acked-by: Russell King<rmk+kernel@arm.linux.org.uk>
>
>> ---
>> drivers/dma/omap-dma.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
>> index c01ea505ee7c..e0990c505889 100644
>> --- a/drivers/dma/omap-dma.c
>> +++ b/drivers/dma/omap-dma.c
>> @@ -1019,6 +1019,9 @@ static int omap_dma_resume(struct omap_chan *c)
>> if (c->paused) {
>> mb();
>>
>> + /* Restore chanel link register */
Just too bad that the comment seems to have a typo.
>> + omap_dma_chan_write(c, CLNK_CTRL, c->desc->clnk_ctrl);
>> +
>> omap_dma_start(c, c->desc);
>> c->paused = false;
>> }
>> --
>> 2.1.0
>>
>
WARNING: multiple messages have this Message-ID (diff)
From: Arend van Spriel <arend@broadcom.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: <vinod.koul@intel.com>, <dan.j.williams@intel.com>,
<dmaengine@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-omap@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] dmaengine: omap-dma: Restore the CLINK_CTRL in resume path
Date: Tue, 16 Sep 2014 15:59:27 +0200 [thread overview]
Message-ID: <5418423F.4010007@broadcom.com> (raw)
In-Reply-To: <20140916135649.GF12379@n2100.arm.linux.org.uk>
On 09/16/14 15:56, Russell King - ARM Linux wrote:
> On Tue, Sep 16, 2014 at 04:53:49PM +0300, Peter Ujfalusi wrote:
>> When the audio stream is paused or suspended we stop the sDMA and when it
>> is unpaused/resumed we start the channel without reconfiguring it.
>> The omap_dma_stop() clears the link configuration when we pause the dma, but
>> it is not setting it back on start. This will result only one audio buffer
>> to be played back and the DMA will stop, since the linking is disabled.
>> We need to restore the CLINK_CTRL register in case of resume.
>>
>> Signed-off-by: Peter Ujfalusi<peter.ujfalusi@ti.com>
>
> Both of these patches now look good, thanks. For both:
>
> Acked-by: Russell King<rmk+kernel@arm.linux.org.uk>
>
>> ---
>> drivers/dma/omap-dma.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
>> index c01ea505ee7c..e0990c505889 100644
>> --- a/drivers/dma/omap-dma.c
>> +++ b/drivers/dma/omap-dma.c
>> @@ -1019,6 +1019,9 @@ static int omap_dma_resume(struct omap_chan *c)
>> if (c->paused) {
>> mb();
>>
>> + /* Restore chanel link register */
Just too bad that the comment seems to have a typo.
>> + omap_dma_chan_write(c, CLNK_CTRL, c->desc->clnk_ctrl);
>> +
>> omap_dma_start(c, c->desc);
>> c->paused = false;
>> }
>> --
>> 2.1.0
>>
>
next prev parent reply other threads:[~2014-09-16 13:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 13:53 [PATCH v2 0/2] dmaengine: omap-dma: Fix cyclic suspend/resume Peter Ujfalusi
2014-09-16 13:53 ` Peter Ujfalusi
2014-09-16 13:53 ` [PATCH v2 1/2] dmaengine: omap-dma: Add memory barrier to dma_resume path Peter Ujfalusi
2014-09-16 13:53 ` Peter Ujfalusi
2014-09-16 13:53 ` [PATCH v2 2/2] dmaengine: omap-dma: Restore the CLINK_CTRL in resume path Peter Ujfalusi
2014-09-16 13:53 ` Peter Ujfalusi
2014-09-16 13:56 ` Russell King - ARM Linux
2014-09-16 13:59 ` Arend van Spriel [this message]
2014-09-16 13:59 ` Arend van Spriel
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=5418423F.4010007@broadcom.com \
--to=arend@broadcom.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=peter.ujfalusi@ti.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 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.