Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

vidc: Error handling for memory heap mapping.

Browse source 
Memory heap should be unsecured if secure call is successful.
This change will make sure that an unsecure will be called
only if securing of the memory heap went through fine.

CRs-Fixed: 393041
Change-Id: I49dd81d1846fc6936518c750a32921c8498ddb95
Signed-off-by: Gopikrishnaiah Anandan <agopik@codeaurora.org>
Signed-off-by: Riaz Ur Rahaman <riazr@codeaurora.org>
Signed-off-by: Ajay Dudani <adudani@codeaurora.org>
This commit is contained in:
Ajay Dudani 2012-08-28 14:21:32 -04:00 committed by Iliyan Malchev
parent 680f9d7c22
commit 18f0324bea
2 changed files with 43 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
View file

@ -955,27 +955,54 @@ void res_trk_secure_set(void)
int res_trk_open_secure_session()
{
int rc;
if (res_trk_check_for_sec_session() == 1) {
mutex_lock(&resource_context.secure_lock);
int rc, memtype;
if (!res_trk_check_for_sec_session()) {
pr_err("Secure sessions are not active\n");
return -EINVAL;
}
mutex_lock(&resource_context.secure_lock);
if (!resource_context.sec_clk_heap) {
pr_err("Securing...\n");
rc = res_trk_enable_iommu_clocks();
if (rc) {
pr_err("IOMMU clock enabled failed while open");
goto error_open;
}
msm_ion_secure_heap(ION_HEAP(resource_context.memtype));
msm_ion_secure_heap(ION_HEAP(resource_context.cmd_mem_type));
if (resource_context.vidc_platform_data->secure_wb_heap)
msm_ion_secure_heap(ION_HEAP(ION_CP_WB_HEAP_ID));
memtype = ION_HEAP(resource_context.memtype);
rc = msm_ion_secure_heap(memtype);
if (rc) {
pr_err("ION heap secure failed heap id %d rc %d\n",
resource_context.memtype, rc);
goto disable_iommu_clks;
}
memtype = ION_HEAP(resource_context.cmd_mem_type);
rc = msm_ion_secure_heap(memtype);
if (rc) {
pr_err("ION heap secure failed heap id %d rc %d\n",
resource_context.cmd_mem_type, rc);
goto unsecure_memtype_heap;
}
if (resource_context.vidc_platform_data->secure_wb_heap) {
memtype = ION_HEAP(ION_CP_WB_HEAP_ID);
rc = msm_ion_secure_heap(memtype);
if (rc) {
pr_err("WB_HEAP_ID secure failed rc %d\n", rc);
goto unsecure_cmd_heap;
}
}
resource_context.sec_clk_heap = 1;
res_trk_disable_iommu_clocks();
mutex_unlock(&resource_context.secure_lock);
}
mutex_unlock(&resource_context.secure_lock);
return 0;
unsecure_cmd_heap:
msm_ion_unsecure_heap(ION_HEAP(resource_context.memtype));
unsecure_memtype_heap:
msm_ion_unsecure_heap(ION_HEAP(resource_context.cmd_mem_type));
disable_iommu_clks:
res_trk_disable_iommu_clocks();
error_open:
resource_context.sec_clk_heap = 0;
mutex_unlock(&resource_context.secure_lock);
return rc;
}
@ -983,12 +1010,13 @@ error_open:
int res_trk_close_secure_session()
{
int rc;
if (res_trk_check_for_sec_session() == 1) {
if (res_trk_check_for_sec_session() == 1 &&
resource_context.sec_clk_heap) {
pr_err("Unsecuring....\n");
mutex_lock(&resource_context.secure_lock);
rc = res_trk_enable_iommu_clocks();
if (rc) {
pr_err("IOMMU clock enabled failed while close");
pr_err("IOMMU clock enabled failed while close\n");
goto error_close;
}
msm_ion_unsecure_heap(ION_HEAP(resource_context.cmd_mem_type));
@ -998,6 +1026,7 @@ int res_trk_close_secure_session()
msm_ion_unsecure_heap(ION_HEAP(ION_CP_WB_HEAP_ID));
res_trk_disable_iommu_clocks();
resource_context.sec_clk_heap = 0;
mutex_unlock(&resource_context.secure_lock);
}
return 0;

1
drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.h
View file

@ -57,6 +57,7 @@ struct res_trk_context {
u32 mmu_clks_on;
u32 secure_session;
struct mutex secure_lock;
u32 sec_clk_heap;
};
#if DEBUG