Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"

[pandora-kernel.git] / drivers / staging / tidspbridge / rmgr / proc.c

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 295845b..e5fec57 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -29,7 +29,6 @@
 #include <dspbridge/dbc.h>
 
 /*  ----------------------------------- OS Adaptation Layer */
-#include <dspbridge/cfg.h>
 #include <dspbridge/list.h>
 #include <dspbridge/ntfy.h>
 #include <dspbridge/sync.h>
@@ -53,6 +52,7 @@
 #include <dspbridge/msg.h>
 #include <dspbridge/dspioctl.h>
 #include <dspbridge/drv.h>
+#include <_tiomap.h>
 
 /*  ----------------------------------- This */
 #include <dspbridge/proc.h>
@@ -1358,7 +1358,6 @@ int proc_map(void *hprocessor, void *pmpu_addr, u32 ul_size,
        int status = 0;
        struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
        struct dmm_map_object *map_obj;
-       u32 tmp_addr = 0;
 
 #ifdef CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK
        if ((ul_map_attr & BUFMODE_MASK) != RBUF) {
@@ -1391,24 +1390,27 @@ int proc_map(void *hprocessor, void *pmpu_addr, u32 ul_size,
 
        /* Add mapping to the page tables. */
        if (!status) {
-
-               /* Mapped address = MSB of VA | LSB of PA */
-               tmp_addr = (va_align | ((u32) pmpu_addr & (PG_SIZE4K - 1)));
                /* mapped memory resource tracking */
-               map_obj = add_mapping_info(pr_ctxt, pa_align, tmp_addr,
+               map_obj = add_mapping_info(pr_ctxt, pa_align, va_align,
                                                size_align);
-               if (!map_obj)
+               if (!map_obj) {
                        status = -ENOMEM;
-               else
-                       status = (*p_proc_object->intf_fxns->pfn_brd_mem_map)
-                           (p_proc_object->hbridge_context, pa_align, va_align,
-                            size_align, ul_map_attr, map_obj->pages);
+               } else {
+                       va_align = user_to_dsp_map(
+                               p_proc_object->hbridge_context->dsp_mmu,
+                               pa_align, va_align, size_align,
+                               map_obj->pages);
+                       if (IS_ERR_VALUE(va_align))
+                               status = (int)va_align;
+               }
        }
        if (!status) {
                /* Mapped address = MSB of VA | LSB of PA */
-               *pp_map_addr = (void *) tmp_addr;
+               map_obj->dsp_addr = (va_align |
+                                       ((u32)pmpu_addr & (PG_SIZE4K - 1)));
+               *pp_map_addr = (void *)map_obj->dsp_addr;
        } else {
-               remove_mapping_information(pr_ctxt, tmp_addr, size_align);
+               remove_mapping_information(pr_ctxt, va_align, size_align);
                dmm_un_map_memory(dmm_mgr, va_align, &size_align);
        }
        mutex_unlock(&proc_lock);
@@ -1513,7 +1515,6 @@ int proc_reserve_memory(void *hprocessor, u32 ul_size,
        struct dmm_object *dmm_mgr;
        int status = 0;
        struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
-       struct dmm_rsv_object *rsv_obj;
 
        if (!p_proc_object) {
                status = -EFAULT;
@@ -1527,22 +1528,6 @@ int proc_reserve_memory(void *hprocessor, u32 ul_size,
        }
 
        status = dmm_reserve_memory(dmm_mgr, ul_size, (u32 *) pp_rsv_addr);
-       if (status != 0)
-               goto func_end;
-
-       /*
-        * A successful reserve should be followed by insertion of rsv_obj
-        * into dmm_rsv_list, so that reserved memory resource tracking
-        * remains uptodate
-        */
-       rsv_obj = kmalloc(sizeof(struct dmm_rsv_object), GFP_KERNEL);
-       if (rsv_obj) {
-               rsv_obj->dsp_reserved_addr = (u32) *pp_rsv_addr;
-               spin_lock(&pr_ctxt->dmm_rsv_lock);
-               list_add(&rsv_obj->link, &pr_ctxt->dmm_rsv_list);
-               spin_unlock(&pr_ctxt->dmm_rsv_lock);
-       }
-
 func_end:
        dev_dbg(bridge, "%s: hprocessor: 0x%p ul_size: 0x%x pp_rsv_addr: 0x%p "
                "status 0x%x\n", __func__, hprocessor,
@@ -1722,10 +1707,9 @@ int proc_un_map(void *hprocessor, void *map_addr,
         */
        status = dmm_un_map_memory(dmm_mgr, (u32) va_align, &size_align);
        /* Remove mapping from the page tables. */
-       if (!status) {
-               status = (*p_proc_object->intf_fxns->pfn_brd_mem_un_map)
-                   (p_proc_object->hbridge_context, va_align, size_align);
-       }
+       if (!status)
+               status = user_to_dsp_unmap(
+                       p_proc_object->hbridge_context->dsp_mmu, va_align);
 
        mutex_unlock(&proc_lock);
        if (status)
@@ -1755,7 +1739,6 @@ int proc_un_reserve_memory(void *hprocessor, void *prsv_addr,
        struct dmm_object *dmm_mgr;
        int status = 0;
        struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
-       struct dmm_rsv_object *rsv_obj;
 
        if (!p_proc_object) {
                status = -EFAULT;
@@ -1769,24 +1752,6 @@ int proc_un_reserve_memory(void *hprocessor, void *prsv_addr,
        }
 
        status = dmm_un_reserve_memory(dmm_mgr, (u32) prsv_addr);
-       if (status != 0)
-               goto func_end;
-
-       /*
-        * A successful unreserve should be followed by removal of rsv_obj
-        * from dmm_rsv_list, so that reserved memory resource tracking
-        * remains uptodate
-        */
-       spin_lock(&pr_ctxt->dmm_rsv_lock);
-       list_for_each_entry(rsv_obj, &pr_ctxt->dmm_rsv_list, link) {
-               if (rsv_obj->dsp_reserved_addr == (u32) prsv_addr) {
-                       list_del(&rsv_obj->link);
-                       kfree(rsv_obj);
-                       break;
-               }
-       }
-       spin_unlock(&pr_ctxt->dmm_rsv_lock);
-
 func_end:
        dev_dbg(bridge, "%s: hprocessor: 0x%p prsv_addr: 0x%p status: 0x%x\n",
                __func__, hprocessor, prsv_addr, status);