* [PATCH 01/12] imx-sdma: remove useless variable
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 02/12] mxs-dma: " Andy Shevchenko
` (11 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
last_used variable is applied only once, so, let's substitute it by its value.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/imx-sdma.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 092867b..285e10c 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1119,15 +1119,12 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
}
static enum dma_status sdma_tx_status(struct dma_chan *chan,
- dma_cookie_t cookie,
- struct dma_tx_state *txstate)
+ dma_cookie_t cookie,
+ struct dma_tx_state *txstate)
{
struct sdma_channel *sdmac = to_sdma_chan(chan);
- dma_cookie_t last_used;
- last_used = chan->cookie;
-
- dma_set_tx_state(txstate, chan->completed_cookie, last_used,
+ dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie,
sdmac->chn_count - sdmac->chn_real_count);
return sdmac->status;
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 02/12] mxs-dma: remove useless variable
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
2013-05-27 12:14 ` [PATCH 01/12] imx-sdma: remove useless variable Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 03/12] edma: no need to assign residue to 0 explicitly Andy Shevchenko
` (10 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
last_used variable is applied only once, so, let's substitute it by its value.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/mxs-dma.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index b48a79c..b3a6379 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -622,10 +622,8 @@ static enum dma_status mxs_dma_tx_status(struct dma_chan *chan,
dma_cookie_t cookie, struct dma_tx_state *txstate)
{
struct mxs_dma_chan *mxs_chan = to_mxs_dma_chan(chan);
- dma_cookie_t last_used;
- last_used = chan->cookie;
- dma_set_tx_state(txstate, chan->completed_cookie, last_used, 0);
+ dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie, 0);
return mxs_chan->status;
}
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 03/12] edma: no need to assign residue to 0 explicitly
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
2013-05-27 12:14 ` [PATCH 01/12] imx-sdma: remove useless variable Andy Shevchenko
2013-05-27 12:14 ` [PATCH 02/12] mxs-dma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 04/12] ep93xx_dma: remove useless use of lock Andy Shevchenko
` (9 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
Residue value is assigned to 0 by dma_cookie_status().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/edma.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c
index cd7e328..8e11499 100644
--- a/drivers/dma/edma.c
+++ b/drivers/dma/edma.c
@@ -502,8 +502,6 @@ static enum dma_status edma_tx_status(struct dma_chan *chan,
} else if (echan->edesc && echan->edesc->vdesc.tx.cookie == cookie) {
struct edma_desc *edesc = echan->edesc;
txstate->residue = edma_desc_size(edesc);
- } else {
- txstate->residue = 0;
}
spin_unlock_irqrestore(&echan->vchan.lock, flags);
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 04/12] ep93xx_dma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (2 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 03/12] edma: no need to assign residue to 0 explicitly Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 05/12] fsldma: " Andy Shevchenko
` (8 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/ep93xx_dma.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index f2bf8c0..591cd8c 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -1313,15 +1313,7 @@ static enum dma_status ep93xx_dma_tx_status(struct dma_chan *chan,
dma_cookie_t cookie,
struct dma_tx_state *state)
{
- struct ep93xx_dma_chan *edmac = to_ep93xx_dma_chan(chan);
- enum dma_status ret;
- unsigned long flags;
-
- spin_lock_irqsave(&edmac->lock, flags);
- ret = dma_cookie_status(chan, cookie, state);
- spin_unlock_irqrestore(&edmac->lock, flags);
-
- return ret;
+ return dma_cookie_status(chan, cookie, state);
}
/**
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 05/12] fsldma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (3 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 04/12] ep93xx_dma: remove useless use of lock Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 06/12] mmp_pdma: " Andy Shevchenko
` (7 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams
Cc: Andy Shevchenko, Li Yang, Zhang Wei, linuxppc-dev
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Zhang Wei <zw@zh-kernel.org>
Cc: linuxppc-dev@lists.ozlabs.org
---
drivers/dma/fsldma.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 49e8fbd..b3f3e90 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -979,15 +979,7 @@ static enum dma_status fsl_tx_status(struct dma_chan *dchan,
dma_cookie_t cookie,
struct dma_tx_state *txstate)
{
- struct fsldma_chan *chan = to_fsl_chan(dchan);
- enum dma_status ret;
- unsigned long flags;
-
- spin_lock_irqsave(&chan->desc_lock, flags);
- ret = dma_cookie_status(dchan, cookie, txstate);
- spin_unlock_irqrestore(&chan->desc_lock, flags);
-
- return ret;
+ return dma_cookie_status(dchan, cookie, txstate);
}
/*----------------------------------------------------------------------------*/
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 06/12] mmp_pdma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (4 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 05/12] fsldma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 07/12] mpc512x_dma: " Andy Shevchenko
` (6 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/mmp_pdma.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c
index c26699f..ad4b0a7 100644
--- a/drivers/dma/mmp_pdma.c
+++ b/drivers/dma/mmp_pdma.c
@@ -632,15 +632,7 @@ static int mmp_pdma_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd,
static enum dma_status mmp_pdma_tx_status(struct dma_chan *dchan,
dma_cookie_t cookie, struct dma_tx_state *txstate)
{
- struct mmp_pdma_chan *chan = to_mmp_pdma_chan(dchan);
- enum dma_status ret;
- unsigned long flags;
-
- spin_lock_irqsave(&chan->desc_lock, flags);
- ret = dma_cookie_status(dchan, cookie, txstate);
- spin_unlock_irqrestore(&chan->desc_lock, flags);
-
- return ret;
+ return dma_cookie_status(dchan, cookie, txstate);
}
/**
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 07/12] mpc512x_dma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (5 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 06/12] mmp_pdma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 08/12] pch_dma: " Andy Shevchenko
` (5 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/mpc512x_dma.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c
index 2d95673..2fe4353 100644
--- a/drivers/dma/mpc512x_dma.c
+++ b/drivers/dma/mpc512x_dma.c
@@ -556,15 +556,7 @@ static enum dma_status
mpc_dma_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
struct dma_tx_state *txstate)
{
- struct mpc_dma_chan *mchan = dma_chan_to_mpc_dma_chan(chan);
- enum dma_status ret;
- unsigned long flags;
-
- spin_lock_irqsave(&mchan->lock, flags);
- ret = dma_cookie_status(chan, cookie, txstate);
- spin_unlock_irqrestore(&mchan->lock, flags);
-
- return ret;
+ return dma_cookie_status(chan, cookie, txstate);
}
/* Prepare descriptor for memory to memory copy */
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 08/12] pch_dma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (6 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 07/12] mpc512x_dma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 09/12] tegra20-apb-dma: " Andy Shevchenko
` (4 subsequent siblings)
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/pch_dma.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index ce3dc3e..237f1d5 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -564,14 +564,7 @@ static void pd_free_chan_resources(struct dma_chan *chan)
static enum dma_status pd_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
struct dma_tx_state *txstate)
{
- struct pch_dma_chan *pd_chan = to_pd_chan(chan);
- enum dma_status ret;
-
- spin_lock_irq(&pd_chan->lock);
- ret = dma_cookie_status(chan, cookie, txstate);
- spin_unlock_irq(&pd_chan->lock);
-
- return ret;
+ return dma_cookie_status(chan, cookie, txstate);
}
static void pd_issue_pending(struct dma_chan *chan)
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 09/12] tegra20-apb-dma: remove useless use of lock
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (7 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 08/12] pch_dma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-29 10:56 ` Laxman Dewangan
2013-05-27 12:14 ` [PATCH 10/12] ipu_idmac: re-use dma_cookie_status() Andy Shevchenko
` (3 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams
Cc: Andy Shevchenko, Stephen Warren, linux-tegra
Accordingly to dma_cookie_status() description locking is not required.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: linux-tegra@vger.kernel.org
---
drivers/dma/tegra20-apb-dma.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 33f59ec..019ccfa 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -767,13 +767,11 @@ static enum dma_status tegra_dma_tx_status(struct dma_chan *dc,
unsigned long flags;
unsigned int residual;
- spin_lock_irqsave(&tdc->lock, flags);
-
ret = dma_cookie_status(dc, cookie, txstate);
- if (ret == DMA_SUCCESS) {
- spin_unlock_irqrestore(&tdc->lock, flags);
+ if (ret == DMA_SUCCESS)
return ret;
- }
+
+ spin_lock_irqsave(&tdc->lock, flags);
/* Check on wait_ack desc status */
list_for_each_entry(dma_desc, &tdc->free_dma_desc, node) {
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 09/12] tegra20-apb-dma: remove useless use of lock
2013-05-27 12:14 ` [PATCH 09/12] tegra20-apb-dma: " Andy Shevchenko
@ 2013-05-29 10:56 ` Laxman Dewangan
2013-05-29 13:42 ` Andy Shevchenko
0 siblings, 1 reply; 24+ messages in thread
From: Laxman Dewangan @ 2013-05-29 10:56 UTC (permalink / raw)
To: Andy Shevchenko
Cc: linux-kernel@vger.kernel.org, Vinod Koul, Dan Williams,
Stephen Warren, linux-tegra@vger.kernel.org
On Monday 27 May 2013 05:44 PM, Andy Shevchenko wrote:
> Accordingly to dma_cookie_status() description locking is not required.
>
I think we need lock here:
From isr handler, we call dma_cookie_complete() which is in
spin-locked. This function updates tx->chan->completed_cookie = tx->cookie;
In tegra_dma_tx_status(), we check for dma_cookie_status() which access
the chan->completed_cookie; and it decides status based on this
As the access of chan->completed_cookie are from different context, we
need this locking.
But did not get why it is documented as locking is not require if shared
variable is getting changed/access from different context simultaneously.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 09/12] tegra20-apb-dma: remove useless use of lock
2013-05-29 10:56 ` Laxman Dewangan
@ 2013-05-29 13:42 ` Andy Shevchenko
0 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-29 13:42 UTC (permalink / raw)
To: Laxman Dewangan
Cc: Andy Shevchenko, linux-kernel@vger.kernel.org, Vinod Koul,
Dan Williams, Stephen Warren, linux-tegra@vger.kernel.org
On Wed, May 29, 2013 at 1:56 PM, Laxman Dewangan <ldewangan@nvidia.com> wrote:
> On Monday 27 May 2013 05:44 PM, Andy Shevchenko wrote:
>>
>> Accordingly to dma_cookie_status() description locking is not required.
>>
> I think we need lock here:
> From isr handler, we call dma_cookie_complete() which is in spin-locked.
> This function updates tx->chan->completed_cookie = tx->cookie;
> In tegra_dma_tx_status(), we check for dma_cookie_status() which access the
> chan->completed_cookie; and it decides status based on this
>
> As the access of chan->completed_cookie are from different context, we
> need this locking.
You need to have a consistent data in the cookies. This is guaranteed
by memory barrier if I got it correctly.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 10/12] ipu_idmac: re-use dma_cookie_status()
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (8 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 09/12] tegra20-apb-dma: " Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-29 2:19 ` Shawn Guo
2013-05-27 12:14 ` [PATCH 11/12] mmp_tdma: set cookies as well when asked for tx status Andy Shevchenko
` (2 subsequent siblings)
12 siblings, 1 reply; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko, Shawn Guo
It's better to use generic dma_cookie_status() that allows user to get standard
possible return codes independently of the DMAC driver in charge.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
drivers/dma/ipu/ipu_idmac.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index d39c2cd..608d4a2 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1593,10 +1593,7 @@ static void idmac_free_chan_resources(struct dma_chan *chan)
static enum dma_status idmac_tx_status(struct dma_chan *chan,
dma_cookie_t cookie, struct dma_tx_state *txstate)
{
- dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie, 0);
- if (cookie != chan->cookie)
- return DMA_ERROR;
- return DMA_SUCCESS;
+ return dma_cookie_status(chan, cookie, txstate);
}
static int __init ipu_idmac_init(struct ipu *ipu)
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 10/12] ipu_idmac: re-use dma_cookie_status()
2013-05-27 12:14 ` [PATCH 10/12] ipu_idmac: re-use dma_cookie_status() Andy Shevchenko
@ 2013-05-29 2:19 ` Shawn Guo
0 siblings, 0 replies; 24+ messages in thread
From: Shawn Guo @ 2013-05-29 2:19 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-kernel, Vinod Koul, Dan Williams
On Mon, May 27, 2013 at 03:14:40PM +0300, Andy Shevchenko wrote:
> It's better to use generic dma_cookie_status() that allows user to get standard
> possible return codes independently of the DMAC driver in charge.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
> ---
> drivers/dma/ipu/ipu_idmac.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
> index d39c2cd..608d4a2 100644
> --- a/drivers/dma/ipu/ipu_idmac.c
> +++ b/drivers/dma/ipu/ipu_idmac.c
> @@ -1593,10 +1593,7 @@ static void idmac_free_chan_resources(struct dma_chan *chan)
> static enum dma_status idmac_tx_status(struct dma_chan *chan,
> dma_cookie_t cookie, struct dma_tx_state *txstate)
> {
> - dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie, 0);
> - if (cookie != chan->cookie)
> - return DMA_ERROR;
> - return DMA_SUCCESS;
> + return dma_cookie_status(chan, cookie, txstate);
> }
>
> static int __init ipu_idmac_init(struct ipu *ipu)
> --
> 1.8.2.rc0.22.gb3600c3
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 11/12] mmp_tdma: set cookies as well when asked for tx status
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (9 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 10/12] ipu_idmac: re-use dma_cookie_status() Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-27 12:14 ` [PATCH 12/12] txx9dmac: return DMA_SUCCESS immediately from device_tx_status() Andy Shevchenko
2013-05-30 17:47 ` [PATCH 00/12] dma: various minor clean ups for slave drivers Vinod Koul
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
dma_set_residue() sets only residue value, so user can't rely on the returned
values of cookies. That patch standardize the behaviour.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/mmp_tdma.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index 43d5a6c..4472915 100644
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -456,7 +456,8 @@ static enum dma_status mmp_tdma_tx_status(struct dma_chan *chan,
{
struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
- dma_set_residue(txstate, tdmac->buf_len - tdmac->pos);
+ dma_set_tx_state(txstate, chan->completed_cookie, chan->cookie,
+ tdmac->buf_len - tdmac->pos);
return tdmac->status;
}
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* [PATCH 12/12] txx9dmac: return DMA_SUCCESS immediately from device_tx_status()
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (10 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 11/12] mmp_tdma: set cookies as well when asked for tx status Andy Shevchenko
@ 2013-05-27 12:14 ` Andy Shevchenko
2013-05-30 17:47 ` [PATCH 00/12] dma: various minor clean ups for slave drivers Vinod Koul
12 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-27 12:14 UTC (permalink / raw)
To: linux-kernel, Vinod Koul, Dan Williams; +Cc: Andy Shevchenko
There is no point to go throught the rest of the function if first call to
dma_cookie_status() returned DMA_SUCCESS.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/txx9dmac.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c
index a59fb48..59357db 100644
--- a/drivers/dma/txx9dmac.c
+++ b/drivers/dma/txx9dmac.c
@@ -962,15 +962,14 @@ txx9dmac_tx_status(struct dma_chan *chan, dma_cookie_t cookie,
enum dma_status ret;
ret = dma_cookie_status(chan, cookie, txstate);
- if (ret != DMA_SUCCESS) {
- spin_lock_bh(&dc->lock);
- txx9dmac_scan_descriptors(dc);
- spin_unlock_bh(&dc->lock);
+ if (ret == DMA_SUCCESS)
+ return DMA_SUCCESS;
- ret = dma_cookie_status(chan, cookie, txstate);
- }
+ spin_lock_bh(&dc->lock);
+ txx9dmac_scan_descriptors(dc);
+ spin_unlock_bh(&dc->lock);
- return ret;
+ return dma_cookie_status(chan, cookie, txstate);
}
static void txx9dmac_chain_dynamic(struct txx9dmac_chan *dc,
--
1.8.2.rc0.22.gb3600c3
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-05-27 12:14 [PATCH 00/12] dma: various minor clean ups for slave drivers Andy Shevchenko
` (11 preceding siblings ...)
2013-05-27 12:14 ` [PATCH 12/12] txx9dmac: return DMA_SUCCESS immediately from device_tx_status() Andy Shevchenko
@ 2013-05-30 17:47 ` Vinod Koul
2013-05-30 18:32 ` Andy Shevchenko
` (2 more replies)
12 siblings, 3 replies; 24+ messages in thread
From: Vinod Koul @ 2013-05-30 17:47 UTC (permalink / raw)
To: Andy Shevchenko
Cc: linux-kernel, Dan Williams, Li Yang, Zhang Wei, linuxppc-dev,
Stephen Warren, linux-tegra, Shawn Guo
On Mon, May 27, 2013 at 03:14:30PM +0300, Andy Shevchenko wrote:
> Here is a set of small independent patches that clean up or fix minor things
> across DMA slave drivers.
The series looks fine. I am going to wait a day more and apply, pls speak up if
you disagree and ack if you agree
--
~Vinod
>
> Andy Shevchenko (12):
> imx-sdma: remove useless variable
> mxs-dma: remove useless variable
> edma: no need to assign residue to 0 explicitly
> ep93xx_dma: remove useless use of lock
> fsldma: remove useless use of lock
> mmp_pdma: remove useless use of lock
> mpc512x_dma: remove useless use of lock
> pch_dma: remove useless use of lock
> tegra20-apb-dma: remove useless use of lock
> ipu_idmac: re-use dma_cookie_status()
> mmp_tdma: set cookies as well when asked for tx status
> txx9dmac: return DMA_SUCCESS immediately from device_tx_status()
>
> drivers/dma/edma.c | 2 --
> drivers/dma/ep93xx_dma.c | 10 +---------
> drivers/dma/fsldma.c | 10 +---------
> drivers/dma/imx-sdma.c | 9 +++------
> drivers/dma/ipu/ipu_idmac.c | 5 +----
> drivers/dma/mmp_pdma.c | 10 +---------
> drivers/dma/mmp_tdma.c | 3 ++-
> drivers/dma/mpc512x_dma.c | 10 +---------
> drivers/dma/mxs-dma.c | 4 +---
> drivers/dma/pch_dma.c | 9 +--------
> drivers/dma/tegra20-apb-dma.c | 8 +++-----
> drivers/dma/txx9dmac.c | 13 ++++++-------
> 12 files changed, 21 insertions(+), 72 deletions(-)
>
> --
> 1.8.2.rc0.22.gb3600c3
>
--
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-05-30 17:47 ` [PATCH 00/12] dma: various minor clean ups for slave drivers Vinod Koul
@ 2013-05-30 18:32 ` Andy Shevchenko
2013-07-15 9:37 ` Vinod Koul
2013-06-01 0:09 ` Dan Williams
2013-07-10 7:54 ` Andy Shevchenko
2 siblings, 1 reply; 24+ messages in thread
From: Andy Shevchenko @ 2013-05-30 18:32 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Shevchenko, linux-kernel@vger.kernel.org, Dan Williams,
Li Yang, Zhang Wei, linuxppc-dev, Stephen Warren, linux-tegra,
Shawn Guo
On Thu, May 30, 2013 at 8:47 PM, Vinod Koul <vinod.koul@intel.com> wrote:
> On Mon, May 27, 2013 at 03:14:30PM +0300, Andy Shevchenko wrote:
>> Here is a set of small independent patches that clean up or fix minor things
>> across DMA slave drivers.
> The series looks fine. I am going to wait a day more and apply, pls speak up if
> you disagree and ack if you agree
I'm not in hurry with it. Please, take your time and do whatever it requires.
Thank you!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-05-30 18:32 ` Andy Shevchenko
@ 2013-07-15 9:37 ` Vinod Koul
2013-07-15 10:21 ` Andy Shevchenko
0 siblings, 1 reply; 24+ messages in thread
From: Vinod Koul @ 2013-07-15 9:37 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Andy Shevchenko, linux-kernel@vger.kernel.org, Dan Williams,
Li Yang, Zhang Wei, linuxppc-dev, Stephen Warren, linux-tegra,
Shawn Guo
On Thu, May 30, 2013 at 09:32:19PM +0300, Andy Shevchenko wrote:
> >> Here is a set of small independent patches that clean up or fix minor things
> >> across DMA slave drivers.
Applied thanks
--
~Vinod
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-07-15 9:37 ` Vinod Koul
@ 2013-07-15 10:21 ` Andy Shevchenko
2013-07-15 9:59 ` Vinod Koul
0 siblings, 1 reply; 24+ messages in thread
From: Andy Shevchenko @ 2013-07-15 10:21 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Shevchenko, Andy Shevchenko, linux-kernel@vger.kernel.org,
Dan Williams, Li Yang, Zhang Wei, linuxppc-dev, Stephen Warren,
linux-tegra, Shawn Guo
On Mon, 2013-07-15 at 15:07 +0530, Vinod Koul wrote:
> On Thu, May 30, 2013 at 09:32:19PM +0300, Andy Shevchenko wrote:
> > >> Here is a set of small independent patches that clean up or fix minor things
> > >> across DMA slave drivers.
>
> Applied thanks
Thank you. You were faster than me, I was just about to send rebased
version.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-07-15 10:21 ` Andy Shevchenko
@ 2013-07-15 9:59 ` Vinod Koul
0 siblings, 0 replies; 24+ messages in thread
From: Vinod Koul @ 2013-07-15 9:59 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Andy Shevchenko, Andy Shevchenko, linux-kernel@vger.kernel.org,
Dan Williams, Li Yang, Zhang Wei, linuxppc-dev, Stephen Warren,
linux-tegra, Shawn Guo
On Mon, Jul 15, 2013 at 01:21:17PM +0300, Andy Shevchenko wrote:
> On Mon, 2013-07-15 at 15:07 +0530, Vinod Koul wrote:
> > On Thu, May 30, 2013 at 09:32:19PM +0300, Andy Shevchenko wrote:
> > > >> Here is a set of small independent patches that clean up or fix minor things
> > > >> across DMA slave drivers.
> >
> > Applied thanks
>
> Thank you. You were faster than me, I was just about to send rebased
> version.
:)
I suspected changes are trivial and it should apply or with slight modfications.
it did apply cleanly so no reason to delay applying on shiny new -rc1
For folks in this part of world, monday morning Linus drops the rc1 usually, so
get staright to it!
--
~Vinod
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-05-30 17:47 ` [PATCH 00/12] dma: various minor clean ups for slave drivers Vinod Koul
2013-05-30 18:32 ` Andy Shevchenko
@ 2013-06-01 0:09 ` Dan Williams
2013-07-15 9:33 ` Vinod Koul
2013-07-10 7:54 ` Andy Shevchenko
2 siblings, 1 reply; 24+ messages in thread
From: Dan Williams @ 2013-06-01 0:09 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Shevchenko, Linux Kernel Mailing List, Li Yang, Zhang Wei,
linuxppc-dev, Stephen Warren, linux-tegra, Shawn Guo
On Thu, May 30, 2013 at 10:47 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> On Mon, May 27, 2013 at 03:14:30PM +0300, Andy Shevchenko wrote:
>> Here is a set of small independent patches that clean up or fix minor things
>> across DMA slave drivers.
> The series looks fine. I am going to wait a day more and apply, pls speak up if
> you disagree and ack if you agree
Looks ok to me. Reminds we can probably take this one step further
and provide a generic implementation for the common case. It's just a
bit inconsistent though that some engines will poll the completion
handler (try to advance the state of the last completed cookie)
whereas others just assume things will be completed asynchronously.
--
Dan
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-06-01 0:09 ` Dan Williams
@ 2013-07-15 9:33 ` Vinod Koul
0 siblings, 0 replies; 24+ messages in thread
From: Vinod Koul @ 2013-07-15 9:33 UTC (permalink / raw)
To: Dan Williams
Cc: Andy Shevchenko, Linux Kernel Mailing List, Li Yang, Zhang Wei,
linuxppc-dev, Stephen Warren, linux-tegra, Shawn Guo
On Fri, May 31, 2013 at 05:09:51PM -0700, Dan Williams wrote:
> On Thu, May 30, 2013 at 10:47 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> > On Mon, May 27, 2013 at 03:14:30PM +0300, Andy Shevchenko wrote:
> >> Here is a set of small independent patches that clean up or fix minor things
> >> across DMA slave drivers.
> > The series looks fine. I am going to wait a day more and apply, pls speak up if
> > you disagree and ack if you agree
>
> Looks ok to me. Reminds we can probably take this one step further
> and provide a generic implementation for the common case. It's just a
> bit inconsistent though that some engines will poll the completion
> handler (try to advance the state of the last completed cookie)
> whereas others just assume things will be completed asynchronously.
agree with that. These are the inconsistencies some of which are based on
hardware and some are user iterpretations...
--
~Vinod
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/12] dma: various minor clean ups for slave drivers
2013-05-30 17:47 ` [PATCH 00/12] dma: various minor clean ups for slave drivers Vinod Koul
2013-05-30 18:32 ` Andy Shevchenko
2013-06-01 0:09 ` Dan Williams
@ 2013-07-10 7:54 ` Andy Shevchenko
2 siblings, 0 replies; 24+ messages in thread
From: Andy Shevchenko @ 2013-07-10 7:54 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Shevchenko, linux-kernel, Dan Williams, Li Yang, Zhang Wei,
linuxppc-dev, Stephen Warren, linux-tegra, Shawn Guo
On Thu, 2013-05-30 at 23:17 +0530, Vinod Koul wrote:
> On Mon, May 27, 2013 at 03:14:30PM +0300, Andy Shevchenko wrote:
> > Here is a set of small independent patches that clean up or fix minor things
> > across DMA slave drivers.
> The series looks fine. I am going to wait a day more and apply, pls speak up if
> you disagree and ack if you agree
Kindly remind about this series.
>
> --
> ~Vinod
> >
> > Andy Shevchenko (12):
> > imx-sdma: remove useless variable
> > mxs-dma: remove useless variable
> > edma: no need to assign residue to 0 explicitly
> > ep93xx_dma: remove useless use of lock
> > fsldma: remove useless use of lock
> > mmp_pdma: remove useless use of lock
> > mpc512x_dma: remove useless use of lock
> > pch_dma: remove useless use of lock
> > tegra20-apb-dma: remove useless use of lock
> > ipu_idmac: re-use dma_cookie_status()
> > mmp_tdma: set cookies as well when asked for tx status
> > txx9dmac: return DMA_SUCCESS immediately from device_tx_status()
> >
> > drivers/dma/edma.c | 2 --
> > drivers/dma/ep93xx_dma.c | 10 +---------
> > drivers/dma/fsldma.c | 10 +---------
> > drivers/dma/imx-sdma.c | 9 +++------
> > drivers/dma/ipu/ipu_idmac.c | 5 +----
> > drivers/dma/mmp_pdma.c | 10 +---------
> > drivers/dma/mmp_tdma.c | 3 ++-
> > drivers/dma/mpc512x_dma.c | 10 +---------
> > drivers/dma/mxs-dma.c | 4 +---
> > drivers/dma/pch_dma.c | 9 +--------
> > drivers/dma/tegra20-apb-dma.c | 8 +++-----
> > drivers/dma/txx9dmac.c | 13 ++++++-------
> > 12 files changed, 21 insertions(+), 72 deletions(-)
> >
> > --
> > 1.8.2.rc0.22.gb3600c3
> >
>
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 24+ messages in thread