diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2010-07-09 23:41:31 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-07-13 12:37:37 -0700 |
| commit | 54d102fc3af508152542b2e664480d3da943f9ea (patch) | |
| tree | 6d01a676d6efbf40c066285f37a6baf32a594f9b /arch/arm/mach-tegra/nvrm | |
| parent | 7bde14619f32542531ef0f30999f2020c58a5231 (diff) | |
[arm/tegra] nvrm dma: Option to select peripheral bus width.
It is require to change the peripheral bus width dynamically.
Provide option to select the peripheral bus width through the
structure NvRmDmaClientBuffer.
The bus width information is passed with upper 16 bit of the
wrapsize parameter which is member of struct NvRmDmaClientBuffer.
Change-Id: I3e1dc84c08b98d7337ca7e661715abb3dc54667a
Reviewed-on: http://git-master.nvidia.com/r/3243
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Tested-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/nvrm')
| -rw-r--r-- | arch/arm/mach-tegra/nvrm/io/common/nvrm_dma.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/nvrm/io/common/nvrm_dma.c b/arch/arm/mach-tegra/nvrm/io/common/nvrm_dma.c index 2943c1895442..42e003ed8ec8 100644 --- a/arch/arm/mach-tegra/nvrm/io/common/nvrm_dma.c +++ b/arch/arm/mach-tegra/nvrm/io/common/nvrm_dma.c @@ -202,6 +202,8 @@ NvError NvRmDmaStartDmaTransfer(NvRmDmaHandle dma, NvRmDmaClientBuffer *b, { bool periph_src, periph_dst; unsigned long src, dst; + unsigned long src_width, dst_width, periph_width; + unsigned long src_wrap, dst_wrap; struct dma_action *action; NvError e = NvSuccess; DECLARE_COMPLETION_ONSTACK(dma_done); @@ -219,6 +221,12 @@ NvError NvRmDmaStartDmaTransfer(NvRmDmaHandle dma, NvRmDmaClientBuffer *b, src = b->SourceBufferPhyAddress; dst = b->DestinationBufferPhyAddress; + src_wrap = b->SourceAddressWrapSize & 0xFFFF; + dst_wrap = b->DestinationAddressWrapSize & 0xFFFF; + + src_width = (b->SourceAddressWrapSize >> 16) & 0xFFFF; + dst_width = (b->DestinationAddressWrapSize >> 16) & 0xFFFF; + WARN_ON_ONCE((src < PAGE_SIZE) || (dst < PAGE_SIZE)); periph_src = (src - IO_APB_PHYS < IO_APB_SIZE); @@ -239,27 +247,34 @@ NvError NvRmDmaStartDmaTransfer(NvRmDmaHandle dma, NvRmDmaClientBuffer *b, action->req.threshold = NULL; action->dma = dma; + if (periph_src && src_width) + periph_width = src_width*8; + else if (periph_dst && dst_width) + periph_width = dst_width*8; + else + periph_width = dma->mod_width; + if ((periph_src && dir==NvRmDmaDirection_Forward) || (periph_dst && dir==NvRmDmaDirection_Reverse)) { action->req.to_memory = 1; action->req.dest_bus_width = 32; - action->req.source_bus_width = dma->mod_width; + action->req.source_bus_width = periph_width; } else { action->req.to_memory = 0; - action->req.dest_bus_width = dma->mod_width; + action->req.dest_bus_width = periph_width; action->req.source_bus_width = 32; } if (dir==NvRmDmaDirection_Forward) { action->req.dest_addr = dst; action->req.source_addr = src; - action->req.dest_wrap = b->DestinationAddressWrapSize; - action->req.source_wrap = b->SourceAddressWrapSize; + action->req.dest_wrap = dst_wrap; + action->req.source_wrap = src_wrap; } else { action->req.dest_addr = src; action->req.source_addr = dst; - action->req.dest_wrap = b->SourceAddressWrapSize; - action->req.source_wrap = b->DestinationAddressWrapSize; + action->req.dest_wrap = src_wrap; + action->req.source_wrap = dst_wrap; } if (timeout) { |