diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2010-11-10 12:12:19 -0600 |
|---|---|---|
| committer | Omar Ramirez Luna <omar.ramirez@ti.com> | 2010-11-10 18:34:44 -0600 |
| commit | 1cf3fb2d359a87880a6a6e0cb25b2ec2d493b119 (patch) | |
| tree | c2dd70ce07ab0b80230c9c83cb0a614574cfedb3 /drivers/staging/tidspbridge/core/tiomap_io.c | |
| parent | d0b345f3ee03a7e8823dd3f8dfbb48aaeeac7c89 (diff) | |
| download | op-kernel-dev-1cf3fb2d359a87880a6a6e0cb25b2ec2d493b119.zip op-kernel-dev-1cf3fb2d359a87880a6a6e0cb25b2ec2d493b119.tar.gz | |
Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
This reverts commit 0c10e91b6cc9d1c6a23e9eed3e0653f30b6eb3d3.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
Diffstat (limited to 'drivers/staging/tidspbridge/core/tiomap_io.c')
| -rw-r--r-- | drivers/staging/tidspbridge/core/tiomap_io.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c index 5ba6795..ba29610 100644 --- a/drivers/staging/tidspbridge/core/tiomap_io.c +++ b/drivers/staging/tidspbridge/core/tiomap_io.c @@ -134,9 +134,10 @@ int read_ext_dsp_data(struct bridge_dev_context *dev_ctxt, if (!status) { ul_tlb_base_virt = - dev_context->sh_s.seg0_da * DSPWORDSIZE; + dev_context->atlb_entry[0].ul_dsp_va * DSPWORDSIZE; DBC_ASSERT(ul_tlb_base_virt <= ul_shm_base_virt); - dw_ext_prog_virt_mem = dev_context->sh_s.seg0_va; + dw_ext_prog_virt_mem = + dev_context->atlb_entry[0].ul_gpp_va; if (!trace_read) { ul_shm_offset_virt = @@ -317,9 +318,8 @@ int write_ext_dsp_data(struct bridge_dev_context *dev_context, ret = -EPERM; if (!ret) { - ul_tlb_base_virt = dev_context->sh_s.seg0_da * - DSPWORDSIZE; - + ul_tlb_base_virt = + dev_context->atlb_entry[0].ul_dsp_va * DSPWORDSIZE; DBC_ASSERT(ul_tlb_base_virt <= ul_shm_base_virt); if (symbols_reloaded) { @@ -337,7 +337,7 @@ int write_ext_dsp_data(struct bridge_dev_context *dev_context, ul_shm_base_virt - ul_tlb_base_virt; if (trace_load) { dw_ext_prog_virt_mem = - dev_context->sh_s.seg0_va; + dev_context->atlb_entry[0].ul_gpp_va; } else { dw_ext_prog_virt_mem = host_res->dw_mem_base[1]; dw_ext_prog_virt_mem += |
