2009-09-23 07:19:07

by Anuj Aggarwal

Subject: [PATCH] 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.

Signed-off-by: Anuj Aggarwal <[email protected]>
---
arch/arm/plat-omap/dma.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index bf08634..7a7b6df 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)
@@ -847,8 +847,9 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
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

2009-09-23 08:24:33

by Venkatraman S

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

On Wed, Sep 23, 2009 at 12:49 PM, Anuj Aggarwal <[email protected]> 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 <[email protected]>
> ---
> ?arch/arm/plat-omap/dma.c | ? 13 +++++++------
> ?1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> index bf08634..7a7b6df 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)
> @@ -847,8 +847,9 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
> ? ? ? ?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);
> ?}

max_fifo_depth should not be set to zero. Perhaps it deserves a check
similar to arb_rate ?

2009-10-02 21:42:30

by Tony Lindgren

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

* Venkatraman S <[email protected]> [090923 01:25]:
> On Wed, Sep 23, 2009 at 12:49 PM, Anuj Aggarwal <[email protected]> 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 <[email protected]>
> > ---
> > ?arch/arm/plat-omap/dma.c | ? 13 +++++++------
> > ?1 files changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
> > index bf08634..7a7b6df 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)
> > @@ -847,8 +847,9 @@ omap_dma_set_global_params(int arb_rate, int max_fifo_depth, int tparams)
> > ? ? ? ?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);
> > ?}
>
> max_fifo_depth should not be set to zero. Perhaps it deserves a check
> similar to arb_rate ?

Any news on updating this patch to also check the max_fifo_depth?

Tony