| Message ID | 1253690346-17865-1-git-send-email-anuj.aggarwal@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
On Wed, Sep 23, 2009 at 12:49 PM, Anuj Aggarwal <anuj.aggarwal@ti.com> 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 | Â 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 ? -- 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
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); }
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 | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)