[PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Anuj Aggarwal]

Argument tparams was not being used to program
global register GCR.HI_THREAD_RESERVED. This patch fixes the same.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
---
 arch/arm/plat-omap/dma.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index fd3154a..0eb676d 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -829,10 +829,10 @@ EXPORT_SYMBOL(omap_free_dma);
  *
  * @param arb_rate
  * @param max_fifo_depth
- * @param tparams - Number of thereads to reserve : DMA_THREAD_RESERVE_NORM
- * 						    DMA_THREAD_RESERVE_ONET
- * 						    DMA_THREAD_RESERVE_TWOT
- * 						    DMA_THREAD_RESERVE_THREET
+ * @param tparams - Number of threads to reserve : DMA_THREAD_RESERVE_NORM
+ * 						   DMA_THREAD_RESERVE_ONET
+ * 						   DMA_THREAD_RESERVE_TWOT
+ * 						   DMA_THREAD_RESERVE_THREET
  */
 void
 omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
@@ -844,11 +844,14 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
 		return;
 	}
 
+	if (max_fifo_depth == 0)
+		max_fifo_depth = 1;
 	if (arb_rate == 0)
 		arb_rate = 1;
 
-	reg = (arb_rate & 0xff) << 16;
-	reg |= (0xff & max_fifo_depth);
+	reg = 0xff & max_fifo_depth;
+	reg |= (0x3 & tparams) << 12;
+	reg |= (arb_rate & 0xff) << 16;
 
 	dma_write(reg, GCR);
 }
-- 
1.6.2.4

Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Randy Dunlap]

On Mon,  5 Oct 2009 14:12:43 +0530 Anuj Aggarwal wrote:

> Argument tparams was not being used to program
> global register GCR.HI_THREAD_RESERVED. This patch fixes the same.
> 
> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
> ---
>  arch/arm/plat-omap/dma.c |   15 +++++++++------
>  1 files changed, 9 insertions(+), 6 deletions(-)


Hi,
Someone please convert all of this source file to correct kernel-doc notation.

Thanks.

> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index fd3154a..0eb676d 100644
> --- a/arch/arm/plat-omap/dma.c
> +++ b/arch/arm/plat-omap/dma.c
> @@ -829,10 +829,10 @@ EXPORT_SYMBOL(omap_free_dma);
>   *
>   * @param arb_rate
>   * @param max_fifo_depth
> - * @param tparams - Number of thereads to reserve : DMA_THREAD_RESERVE_NORM
> - * 						    DMA_THREAD_RESERVE_ONET
> - * 						    DMA_THREAD_RESERVE_TWOT
> - * 						    DMA_THREAD_RESERVE_THREET
> + * @param tparams - Number of threads to reserve : DMA_THREAD_RESERVE_NORM
> + * 						   DMA_THREAD_RESERVE_ONET
> + * 						   DMA_THREAD_RESERVE_TWOT
> + * 						   DMA_THREAD_RESERVE_THREET
>   */
>  void
>  omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
> @@ -844,11 +844,14 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
>  		return;
>  	}
>  
> +	if (max_fifo_depth == 0)
> +		max_fifo_depth = 1;
>  	if (arb_rate == 0)
>  		arb_rate = 1;
>  
> -	reg = (arb_rate & 0xff) << 16;
> -	reg |= (0xff & max_fifo_depth);
> +	reg = 0xff & max_fifo_depth;
> +	reg |= (0x3 & tparams) << 12;
> +	reg |= (arb_rate & 0xff) << 16;
>  
>  	dma_write(reg, GCR);
>  }
> -- 


---
~Randy

Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Venkatraman S]

On Mon, Oct 5, 2009 at 10:11 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> On Mon,  5 Oct 2009 14:12:43 +0530 Anuj Aggarwal wrote:
>
>> Argument tparams was not being used to program
>> global register GCR.HI_THREAD_RESERVED. This patch fixes the same.
>>
>> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
>> ---
>>  arch/arm/plat-omap/dma.c |   15 +++++++++------
>>  1 files changed, 9 insertions(+), 6 deletions(-)
>
>
> Hi,
> Someone please convert all of this source file to correct kernel-doc notation.
>
> Thanks.
>

I now have this on my TODO list. As a bug fix, shouldn't this be
pulled in and the doc updates for all the functions can be done as a
separate patch ?
Anuj,
 Can you please correct the comments for this function to proper
format along with your changes ?

Thanks,
Venkat.

Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Randy Dunlap]

On Wed, 7 Oct 2009 14:48:26 +0530 Venkatraman S wrote:

> On Mon, Oct 5, 2009 at 10:11 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > On Mon,  5 Oct 2009 14:12:43 +0530 Anuj Aggarwal wrote:
> >
> >> Argument tparams was not being used to program
> >> global register GCR.HI_THREAD_RESERVED. This patch fixes the same.
> >>
> >> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
> >> ---
> >>  arch/arm/plat-omap/dma.c |   15 +++++++++------
> >>  1 files changed, 9 insertions(+), 6 deletions(-)
> >
> >
> > Hi,
> > Someone please convert all of this source file to correct kernel-doc notation.
> >
> > Thanks.
> >
> 
> I now have this on my TODO list. As a bug fix, shouldn't this be
> pulled in and the doc updates for all the functions can be done as a
> separate patch ?

Yes.  Thanks.

> Anuj,
>  Can you please correct the comments for this function to proper
> format along with your changes ?
> 
> Thanks,
> Venkat.


---
~Randy

Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Tony Lindgren]

* Randy Dunlap <rdunlap@xenotime.net> [091007 08:38]:
> On Wed, 7 Oct 2009 14:48:26 +0530 Venkatraman S wrote:
> 
> > On Mon, Oct 5, 2009 at 10:11 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> > > On Mon,  5 Oct 2009 14:12:43 +0530 Anuj Aggarwal wrote:
> > >
> > >> Argument tparams was not being used to program
> > >> global register GCR.HI_THREAD_RESERVED. This patch fixes the same.
> > >>
> > >> Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
> > >> ---
> > >>  arch/arm/plat-omap/dma.c |   15 +++++++++------
> > >>  1 files changed, 9 insertions(+), 6 deletions(-)
> > >
> > >
> > > Hi,
> > > Someone please convert all of this source file to correct kernel-doc notation.
> > >
> > > Thanks.
> > >
> > 
> > I now have this on my TODO list. As a bug fix, shouldn't this be
> > pulled in and the doc updates for all the functions can be done as a
> > separate patch ?
> 
> Yes.  Thanks.

Will add this fix to my omap-fixes queue.

Tony

> 
> > Anuj,
> >  Can you please correct the comments for this function to proper
> > format along with your changes ?
> > 
> > Thanks,
> > Venkat.
> 
> 
> ---
> ~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[APPLIED] [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: omap-fixes

Initial commit ID (Likely to change): dffdcf35f45c7767e96141d1e61bea021d6bd051

PatchWorks
http://patchwork.kernel.org/patch/51708/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dffdcf35f45c7767e96141d1e61bea021d6bd051