* [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
@ 2009-10-05 8:42 Anuj Aggarwal
2009-10-05 16:41 ` Randy Dunlap
2009-10-07 22:07 ` [APPLIED] " Tony Lindgren
0 siblings, 2 replies; 6+ messages in thread
From: Anuj Aggarwal @ 2009-10-05 8:42 UTC (permalink / raw)
To: linux-omap, linux-kernel; +Cc: svenkatr, tony, 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
2009-10-05 8:42 [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params() Anuj Aggarwal
@ 2009-10-05 16:41 ` Randy Dunlap
2009-10-07 9:18 ` Venkatraman S
2009-10-07 22:07 ` [APPLIED] " Tony Lindgren
1 sibling, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2009-10-05 16:41 UTC (permalink / raw)
To: Anuj Aggarwal; +Cc: linux-omap, linux-kernel, svenkatr, tony
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
2009-10-05 16:41 ` Randy Dunlap
@ 2009-10-07 9:18 ` Venkatraman S
2009-10-07 15:38 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Venkatraman S @ 2009-10-07 9:18 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Anuj Aggarwal, linux-omap, linux-kernel, tony
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
2009-10-07 9:18 ` Venkatraman S
@ 2009-10-07 15:38 ` Randy Dunlap
2009-10-07 22:03 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2009-10-07 15:38 UTC (permalink / raw)
To: Venkatraman S; +Cc: Anuj Aggarwal, linux-omap, linux-kernel, tony
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
2009-10-07 15:38 ` Randy Dunlap
@ 2009-10-07 22:03 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2009-10-07 22:03 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Venkatraman S, Anuj Aggarwal, linux-omap, linux-kernel
* 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [APPLIED] [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params()
2009-10-05 8:42 [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params() Anuj Aggarwal
2009-10-05 16:41 ` Randy Dunlap
@ 2009-10-07 22:07 ` Tony Lindgren
1 sibling, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2009-10-07 22:07 UTC (permalink / raw)
To: linux-omap
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-07 22:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-05 8:42 [PATCH v2] SDMA: Fixing bug in omap_dma_set_global_params() Anuj Aggarwal
2009-10-05 16:41 ` Randy Dunlap
2009-10-07 9:18 ` Venkatraman S
2009-10-07 15:38 ` Randy Dunlap
2009-10-07 22:03 ` Tony Lindgren
2009-10-07 22:07 ` [APPLIED] " Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).