[PATCH 1/2] dma: tegra20-apbdma: err message correction

[PATCH 1/2] dma: tegra20-apbdma: err message correction

[Dmitry Osipenko]

Fixed err msg params order on irq request fail.

Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/dma/tegra20-apb-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index ce19340..a84bb7f 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1339,7 +1339,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(&pdev->dev,
 				"request_irq failed with err %d channel %d\n",
-				i, ret);
+				ret, i);
 			goto err_irq;
 		}
 
-- 
1.8.2.1

[PATCH 2/2] dma: tegra: avoid channel lock up after free

[Dmitry Osipenko]

Lock scenario: Channel 1 was allocated and prepared as slave_sg, used and freed.
Now preparation of cyclic dma on channel 1 will fail with err "DMA configuration
conflict" because tdc->isr_handler still setted to handle_once_dma_done.

This happens because tegra_dma_abort_all() won't be called on channel freeing
if pending list is empty and channel not busy. We need to clear isr_handler
on channel freeing to avoid locking.

Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
I have sent this fix some month ago and Laxman gave his ack, but since that
time I found that it's not right to include multiple changes in one patch,
so converted it to trivial change.

 drivers/dma/tegra20-apb-dma.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index a84bb7f..c541276 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1191,6 +1191,7 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc)
 	list_splice_init(&tdc->free_dma_desc, &dma_desc_list);
 	INIT_LIST_HEAD(&tdc->cb_desc);
 	tdc->config_init = false;
+	tdc->isr_handler = NULL;
 	spin_unlock_irqrestore(&tdc->lock, flags);
 
 	while (!list_empty(&dma_desc_list)) {
-- 
1.8.2.1

Re: [PATCH 1/2] dma: tegra20-apbdma: err message correction

[Stephen Warren]

On 05/10/2013 03:06 PM, Dmitry Osipenko wrote:
> Fixed err msg params order on irq request fail.

These two look fine to me, but patches to DMA drivers should be taken
through the DMA driver tree; that's Vinod Koul <vinod.koul-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
and Dan Williams <djbw-b10kYP2dOMg@public.gmane.org>.

[PATCH 1/2] dma: tegra20-apbdma: err message correction

[Dmitry Osipenko]

Fixed err msg params order on irq request fail.

Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
Reposting with dma maintainers cc'd as suggested by Stephen.
Added Stephen's ack.

 drivers/dma/tegra20-apb-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index ce19340..a84bb7f 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1339,7 +1339,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
 		if (ret) {
 			dev_err(&pdev->dev,
 				"request_irq failed with err %d channel %d\n",
-				i, ret);
+				ret, i);
 			goto err_irq;
 		}
 
-- 
1.8.2.1

Re: [PATCH 1/2] dma: tegra20-apbdma: err message correction

[Laxman Dewangan]

On Saturday 11 May 2013 10:00 PM, Dmitry Osipenko wrote:
> Fixed err msg params order on irq request fail.
>
> Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---

Looks good to me for both series.
Acked-by: Laxman Dewangan <ldewangan>nvidia.com

Re: [PATCH 1/2] dma: tegra20-apbdma: err message correction

[Laxman Dewangan]

On Saturday 11 May 2013 10:00 PM, Dmitry Osipenko wrote:
> Fixed err msg params order on irq request fail.
>
> Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---

Looks good to me for both series.
Acked-by: Laxman Dewangan <ldewangan>nvidia.com

Re: [PATCH 1/2] dma: tegra20-apbdma: err message correction

[Vinod Koul]

On Mon, May 13, 2013 at 09:34:05AM +0530, Laxman Dewangan wrote:
> On Saturday 11 May 2013 10:00 PM, Dmitry Osipenko wrote:
> >Fixed err msg params order on irq request fail.
> >
> >Signed-off-by: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> >Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >---
> 
> Looks good to me for both series.
> Acked-by: Laxman Dewangan <ldewangan>nvidia.com
@missing here :)

--
~Vinod