staging: tidspbridge - remove reserved memory clean up

Now iommv module keeps track of iommu memory used,
we do not need resource cleanup for reserved
memories anymore.

Signed-off-by: Fernando Guzman Lugo <x0095840@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index c1f363ec9afab51b225c1fc0007c7edf62e5dbb7..427f38b7b43a5011a80cea8a016a30fbfdb7bcb5 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -165,10 +165,6 @@ struct process_context {
        struct list_head dmm_map_list;
        spinlock_t dmm_map_lock;
 
-       /* DMM reserved memory resources */
-       struct list_head dmm_rsv_list;
-       spinlock_t dmm_rsv_lock;
-
        /* DSP Heap resources */
        struct dspheap_res_object *pdspheap_list;
 

diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 0c857b93416a786ec63f763167ee9d47967ad0b2..91cc168516e5e25f553b3cdb8fe317ea12720b2f 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -146,7 +146,6 @@ int drv_remove_all_dmm_res_elements(void *process_ctxt)
        struct process_context *ctxt = (struct process_context *)process_ctxt;
        int status = 0;
        struct dmm_map_object *temp_map, *map_obj;
-       struct dmm_rsv_object *temp_rsv, *rsv_obj;
 
        /* Free DMM mapped memory resources */
        list_for_each_entry_safe(map_obj, temp_map, &ctxt->dmm_map_list, link) {
@@ -156,16 +155,6 @@ int drv_remove_all_dmm_res_elements(void *process_ctxt)
                        pr_err("%s: proc_un_map failed!"
                               " status = 0x%xn", __func__, status);
        }
-
-       /* Free DMM reserved memory resources */
-       list_for_each_entry_safe(rsv_obj, temp_rsv, &ctxt->dmm_rsv_list, link) {
-               status = proc_un_reserve_memory(ctxt->hprocessor, (void *)
-                                               rsv_obj->dsp_reserved_addr,
-                                               ctxt);
-               if (status)
-                       pr_err("%s: proc_un_reserve_memory failed!"
-                              " status = 0x%xn", __func__, status);
-       }
        return status;
 }
 

diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 5d0670c7af05de83598768e3e5c4333ff44b4288..63052b0e3426dc1b434994d147f5484b0c346c5c 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -509,8 +509,6 @@ static int bridge_open(struct inode *ip, struct file *filp)
                pr_ctxt->res_state = PROC_RES_ALLOCATED;
                spin_lock_init(&pr_ctxt->dmm_map_lock);
                INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);
-               spin_lock_init(&pr_ctxt->dmm_rsv_lock);
-               INIT_LIST_HEAD(&pr_ctxt->dmm_rsv_list);
 
                pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);
                if (pr_ctxt->node_id) {

diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 59c946bb3ed26492862dfd5d4b3ea1eeebeb5106..e5fec5729037e68d780c26722fdef5e69ff7f63e 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -1515,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;
@@ -1529,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,
@@ -1756,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;
@@ -1770,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);