Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2890350 authored by Felipe Contreras's avatar Felipe Contreras Committed by Omar Ramirez Luna
Browse files

Revert "staging: tidspbridge - remove reserved memory clean up" 



This reverts commit db348ca3.

Signed-off-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: default avatarOmar Ramirez Luna <omar.ramirez@ti.com>
parent 2fa28a51

drivers/staging/tidspbridge/include/dspbridge/drv.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -165,6 +165,10 @@ struct process_context { 
	struct list_head dmm_map_list;

	struct list_head dmm_map_list;

	spinlock_t dmm_map_lock;

	spinlock_t dmm_map_lock;





	/* DMM reserved memory resources */

	struct list_head dmm_rsv_list;

	spinlock_t dmm_rsv_lock;



	/* DSP Heap resources */

	/* DSP Heap resources */

	struct dspheap_res_object *pdspheap_list;

	struct dspheap_res_object *pdspheap_list;

drivers/staging/tidspbridge/rmgr/drv.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ int drv_remove_all_dmm_res_elements(void *process_ctxt) 
	struct process_context *ctxt = (struct process_context *)process_ctxt;

	struct process_context *ctxt = (struct process_context *)process_ctxt;

	int status = 0;

	int status = 0;

	struct dmm_map_object *temp_map, *map_obj;

	struct dmm_map_object *temp_map, *map_obj;

	struct dmm_rsv_object *temp_rsv, *rsv_obj;





	/* Free DMM mapped memory resources */

	/* Free DMM mapped memory resources */

	list_for_each_entry_safe(map_obj, temp_map, &ctxt->dmm_map_list, link) {

	list_for_each_entry_safe(map_obj, temp_map, &ctxt->dmm_map_list, link) {
@@ -155,6 +156,16 @@ int drv_remove_all_dmm_res_elements(void *process_ctxt) 
			pr_err("%s: proc_un_map failed!"

			pr_err("%s: proc_un_map failed!"

			       " status = 0x%xn", __func__, status);

			       " 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;

	return status;

}

}

drivers/staging/tidspbridge/rmgr/drv_interface.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -509,6 +509,8 @@ static int bridge_open(struct inode *ip, struct file *filp) 
		pr_ctxt->res_state = PROC_RES_ALLOCATED;

		pr_ctxt->res_state = PROC_RES_ALLOCATED;

		spin_lock_init(&pr_ctxt->dmm_map_lock);

		spin_lock_init(&pr_ctxt->dmm_map_lock);

		INIT_LIST_HEAD(&pr_ctxt->dmm_map_list);

		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);

		pr_ctxt->node_id = kzalloc(sizeof(struct idr), GFP_KERNEL);

		if (pr_ctxt->node_id) {

		if (pr_ctxt->node_id) {

drivers/staging/tidspbridge/rmgr/proc.c

+36 −0
Original line number Original line Diff line number Diff line
@@ -1515,6 +1515,7 @@ int proc_reserve_memory(void *hprocessor, u32 ul_size, 
	struct dmm_object *dmm_mgr;

	struct dmm_object *dmm_mgr;

	int status = 0;

	int status = 0;

	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;

	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;

	struct dmm_rsv_object *rsv_obj;





	if (!p_proc_object) {

	if (!p_proc_object) {

		status = -EFAULT;

		status = -EFAULT;
@@ -1528,6 +1529,22 @@ int proc_reserve_memory(void *hprocessor, u32 ul_size, 
	}

	}





	status = dmm_reserve_memory(dmm_mgr, ul_size, (u32 *) pp_rsv_addr);

	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:

func_end:

	dev_dbg(bridge, "%s: hprocessor: 0x%p ul_size: 0x%x pp_rsv_addr: 0x%p "

	dev_dbg(bridge, "%s: hprocessor: 0x%p ul_size: 0x%x pp_rsv_addr: 0x%p "

		"status 0x%x\n", __func__, hprocessor,

		"status 0x%x\n", __func__, hprocessor,
@@ -1739,6 +1756,7 @@ int proc_un_reserve_memory(void *hprocessor, void *prsv_addr, 
	struct dmm_object *dmm_mgr;

	struct dmm_object *dmm_mgr;

	int status = 0;

	int status = 0;

	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;

	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;

	struct dmm_rsv_object *rsv_obj;





	if (!p_proc_object) {

	if (!p_proc_object) {

		status = -EFAULT;

		status = -EFAULT;
@@ -1752,6 +1770,24 @@ int proc_un_reserve_memory(void *hprocessor, void *prsv_addr, 
	}

	}





	status = dmm_un_reserve_memory(dmm_mgr, (u32) 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:

func_end:

	dev_dbg(bridge, "%s: hprocessor: 0x%p prsv_addr: 0x%p status: 0x%x\n",

	dev_dbg(bridge, "%s: hprocessor: 0x%p prsv_addr: 0x%p status: 0x%x\n",

		__func__, hprocessor, prsv_addr, status);

		__func__, hprocessor, prsv_addr, status);