From: Vinod Koul <vkoul@kernel.org> To: Bin Liu <b-liu@ti.com>, Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: dmaengine@vger.kernel.org, linux-usb@vger.kernel.org, stable@vger.kernel.org Subject: dma: cppi41: delete channel from pending list when stop channel Date: Sat, 24 Nov 2018 19:58:03 +0530 [thread overview] Message-ID: <20181124142803.GI3175@vkoul-mobl.Dlink> (raw) On 12-11-18, 09:43, Bin Liu wrote: > The driver defines three states for a cppi channel. > - idle: .chan_busy == 0 && not in .pending list > - pending: .chan_busy == 0 && in .pending list > - busy: .chan_busy == 1 && not in .pending list > > There are cases in which the cppi channel could be in the pending state > when cppi41_dma_issue_pending() is called after cppi41_runtime_suspend() > is called. > > cppi41_stop_chan() has a bug for these cases to set channels to idle state. > It only checks the .chan_busy flag, but not the .pending list, then later > when cppi41_runtime_resume() is called the channels in .pending list will > be transitioned to busy state. > > Removing channels from the .pending list solves the problem. I would like some testing, given that intent is to go to stable. Peter..? > > Fixes: 975faaeb9985 ("dma: cppi41: start tear down only if channel is busy") > Cc: stable@vger.kernel.org # v3.15+ > Signed-off-by: Bin Liu <b-liu@ti.com> > --- > drivers/dma/ti/cppi41.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c > index 1497da367710..e507ec36c0d3 100644 > --- a/drivers/dma/ti/cppi41.c > +++ b/drivers/dma/ti/cppi41.c > @@ -723,8 +723,22 @@ static int cppi41_stop_chan(struct dma_chan *chan) > > desc_phys = lower_32_bits(c->desc_phys); > desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc); > - if (!cdd->chan_busy[desc_num]) > + if (!cdd->chan_busy[desc_num]) { > + struct cppi41_channel *cc, *_ct; > + > + /* > + * channels might still be in the pendling list if > + * cppi41_dma_issue_pending() is called after > + * cppi41_runtime_suspend() is called > + */ > + list_for_each_entry_safe(cc, _ct, &cdd->pending, node) { > + if (cc != c) > + continue; > + list_del(&cc->node); > + break; > + } > return 0; > + } > > ret = cppi41_tear_down_chan(c); > if (ret) > -- > 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Vinod Koul <vkoul@kernel.org> To: Bin Liu <b-liu@ti.com>, Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: dmaengine@vger.kernel.org, linux-usb@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] dma: cppi41: delete channel from pending list when stop channel Date: Sat, 24 Nov 2018 19:58:03 +0530 [thread overview] Message-ID: <20181124142803.GI3175@vkoul-mobl.Dlink> (raw) In-Reply-To: <20181112154322.24337-1-b-liu@ti.com> On 12-11-18, 09:43, Bin Liu wrote: > The driver defines three states for a cppi channel. > - idle: .chan_busy == 0 && not in .pending list > - pending: .chan_busy == 0 && in .pending list > - busy: .chan_busy == 1 && not in .pending list > > There are cases in which the cppi channel could be in the pending state > when cppi41_dma_issue_pending() is called after cppi41_runtime_suspend() > is called. > > cppi41_stop_chan() has a bug for these cases to set channels to idle state. > It only checks the .chan_busy flag, but not the .pending list, then later > when cppi41_runtime_resume() is called the channels in .pending list will > be transitioned to busy state. > > Removing channels from the .pending list solves the problem. I would like some testing, given that intent is to go to stable. Peter..? > > Fixes: 975faaeb9985 ("dma: cppi41: start tear down only if channel is busy") > Cc: stable@vger.kernel.org # v3.15+ > Signed-off-by: Bin Liu <b-liu@ti.com> > --- > drivers/dma/ti/cppi41.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/drivers/dma/ti/cppi41.c b/drivers/dma/ti/cppi41.c > index 1497da367710..e507ec36c0d3 100644 > --- a/drivers/dma/ti/cppi41.c > +++ b/drivers/dma/ti/cppi41.c > @@ -723,8 +723,22 @@ static int cppi41_stop_chan(struct dma_chan *chan) > > desc_phys = lower_32_bits(c->desc_phys); > desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc); > - if (!cdd->chan_busy[desc_num]) > + if (!cdd->chan_busy[desc_num]) { > + struct cppi41_channel *cc, *_ct; > + > + /* > + * channels might still be in the pendling list if > + * cppi41_dma_issue_pending() is called after > + * cppi41_runtime_suspend() is called > + */ > + list_for_each_entry_safe(cc, _ct, &cdd->pending, node) { > + if (cc != c) > + continue; > + list_del(&cc->node); > + break; > + } > return 0; > + } > > ret = cppi41_tear_down_chan(c); > if (ret) > -- > 2.17.1 -- ~Vinod
next reply other threads:[~2018-11-24 14:28 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-24 14:28 Vinod Koul [this message] 2018-11-24 14:28 ` [PATCH] dma: cppi41: delete channel from pending list when stop channel Vinod Koul -- strict thread matches above, loose matches on Subject: below -- 2018-12-06 14:56 Bin Liu 2018-12-05 8:32 Vinod Koul 2018-11-28 11:16 Peter Ujfalusi 2018-11-28 11:15 Peter Ujfalusi 2018-11-26 13:47 Bin Liu 2018-11-26 13:47 ` [PATCH] " Bin Liu 2018-11-12 15:46 Bin Liu 2018-11-12 15:43 Bin Liu 2018-11-12 15:43 ` [PATCH] " Bin Liu 2018-11-12 15:40 Bin Liu
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=20181124142803.GI3175@vkoul-mobl.Dlink \ --to=vkoul@kernel.org \ --cc=b-liu@ti.com \ --cc=dmaengine@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ --cc=stable@vger.kernel.org \ /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.