Skip to contentSkip to conversation

SDMA: Fixing bug in omap_dma_set_global_params()

PATCH In review Anuj Aggarwal 4 participants 6 messages Oct 5, 2009 – Oct 7, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 SDMA: Fixing bug in omap_dma_set_global_params()

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

---
 arch/arm/plat-omap/dma.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
arch/arm/plat-omap/dma.c +9 -6
index fd3154a..0eb676d 100644
@@ -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);
 }
Signature · 1 line
1.6.2.4
#1 lore raw
Quoted 7 lines · 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.

---
 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.

Quoted 27 lines
arch/arm/plat-omap/dma.c +6 -4
index fd3154a..0eb676d 100644
@@ -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)

arch/arm/plat-omap/dma.c omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams) · line 857

Quoted 10 lines
arch/arm/plat-omap/dma.c +3 -2
 		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

#2 lore raw
Quoted 11 lines · Randy Dunlap
Quoted 7 lines · 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.

---
 arch/arm/plat-omap/dma.c |   15 +++++++++------

 1 files changed, 9 insertions(+), 6 deletions(-)
Quoted 5 lines

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.

#3 lore raw
Quoted 15 lines · On Wed, 7 Oct 2009 14:48:26 +0530 Venkatraman S wrote:
Quoted 14 lines · Randy Dunlap
Quoted 7 lines · 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.

---
 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.

Quoted 6 lines
Quoted 2 lines

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.

Quoted 6 lines

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

Thanks,
Venkat.

---
~Randy

#4 lore raw
Quoted 17 lines · Randy Dunlap
Quoted 15 lines · On Wed, 7 Oct 2009 14:48:26 +0530 Venkatraman S wrote:
Quoted 14 lines · Randy Dunlap
Quoted 7 lines · 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.

---
 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.

Quoted 8 lines
Quoted 6 lines
Quoted 2 lines

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

Quoted 11 lines
Quoted 7 lines

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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#5 lore raw

PATCH v2 1/1 SDMA: Fixing bug in omap_dma_set_global_params()

In reply to Anuj Aggarwal

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