msm: display: maintain smmu for secure video
Currently video maps and unmaps the secure memory.
It could be too early to unmap it.
Rotator and MDP will maintain this, only unmap it when
no more needed. Memory managr has a refence count for it.
Change-Id: I5ca7cb09c0ad4b9e39808e937c2f50264727730c
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
diff --git a/drivers/char/msm_rotator.c b/drivers/char/msm_rotator.c
index 729ac10..205c04d 100644
--- a/drivers/char/msm_rotator.c
+++ b/drivers/char/msm_rotator.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -157,6 +157,8 @@
#ifdef CONFIG_MSM_BUS_SCALING
uint32_t bus_client_handle;
#endif
+ u32 sec_mapped;
+ u32 mmu_clk_on;
};
#define COMPONENT_5BITS 1
@@ -170,6 +172,16 @@
CLK_DIS,
CLK_SUSPEND,
};
+struct res_mmu_clk {
+ char *mmu_clk_name;
+ struct clk *mmu_clk;
+};
+
+static struct res_mmu_clk rot_mmu_clks[] = {
+ {"mdp_iommu_clk"}, {"rot_iommu_clk"},
+ {"vcodec_iommu0_clk"}, {"vcodec_iommu1_clk"},
+ {"smmu_iface_clk"}
+};
int msm_rotator_iommu_map_buf(int mem_id, int domain,
unsigned long *start, unsigned long *len,
@@ -1230,6 +1242,87 @@
}
+static int rot_enable_iommu_clocks(struct msm_rotator_dev *rot_dev)
+{
+ int ret = 0, i;
+ if (rot_dev->mmu_clk_on)
+ return 0;
+ for (i = 0; i < ARRAY_SIZE(rot_mmu_clks); i++) {
+ rot_mmu_clks[i].mmu_clk = clk_get(&msm_rotator_dev->pdev->dev,
+ rot_mmu_clks[i].mmu_clk_name);
+ if (IS_ERR(rot_mmu_clks[i].mmu_clk)) {
+ pr_err(" %s: Get failed for clk %s", __func__,
+ rot_mmu_clks[i].mmu_clk_name);
+ ret = PTR_ERR(rot_mmu_clks[i].mmu_clk);
+ break;
+ }
+ ret = clk_prepare_enable(rot_mmu_clks[i].mmu_clk);
+ if (ret) {
+ clk_put(rot_mmu_clks[i].mmu_clk);
+ rot_mmu_clks[i].mmu_clk = NULL;
+ }
+ }
+ if (ret) {
+ for (i--; i >= 0; i--) {
+ clk_disable_unprepare(rot_mmu_clks[i].mmu_clk);
+ clk_put(rot_mmu_clks[i].mmu_clk);
+ rot_mmu_clks[i].mmu_clk = NULL;
+ }
+ } else {
+ rot_dev->mmu_clk_on = 1;
+ }
+ return ret;
+}
+
+static int rot_disable_iommu_clocks(struct msm_rotator_dev *rot_dev)
+{
+ int i;
+ if (!rot_dev->mmu_clk_on)
+ return 0;
+ for (i = 0; i < ARRAY_SIZE(rot_mmu_clks); i++) {
+ clk_disable_unprepare(rot_mmu_clks[i].mmu_clk);
+ clk_put(rot_mmu_clks[i].mmu_clk);
+ rot_mmu_clks[i].mmu_clk = NULL;
+ }
+ rot_dev->mmu_clk_on = 0;
+ return 0;
+}
+
+static int map_sec_resource(struct msm_rotator_dev *rot_dev)
+{
+ int ret = 0;
+ if (rot_dev->sec_mapped)
+ return 0;
+
+ ret = rot_enable_iommu_clocks(rot_dev);
+ if (ret) {
+ pr_err("IOMMU clock enabled failed while open");
+ return ret;
+ }
+ ret = msm_ion_secure_heap(ION_HEAP(ION_CP_MM_HEAP_ID));
+ if (ret)
+ pr_err("ION heap secure failed heap id %d ret %d\n",
+ ION_CP_MM_HEAP_ID, ret);
+ else
+ rot_dev->sec_mapped = 1;
+ rot_disable_iommu_clocks(rot_dev);
+ return ret;
+}
+
+static int unmap_sec_resource(struct msm_rotator_dev *rot_dev)
+{
+ int ret = 0;
+ ret = rot_enable_iommu_clocks(rot_dev);
+ if (ret) {
+ pr_err("IOMMU clock enabled failed while close\n");
+ return ret;
+ }
+ msm_ion_unsecure_heap(ION_HEAP(ION_CP_MM_HEAP_ID));
+ rot_dev->sec_mapped = 0;
+ rot_disable_iommu_clocks(rot_dev);
+ return ret;
+}
+
static int msm_rotator_start(unsigned long arg,
struct msm_rotator_fd_info *fd_info)
{
@@ -1354,7 +1447,8 @@
if (rc == 0 && copy_to_user((void __user *)arg, &info, sizeof(info)))
rc = -EFAULT;
-
+ if ((rc == 0) && (info.secure))
+ map_sec_resource(msm_rotator_dev);
rotator_start_exit:
mutex_unlock(&msm_rotator_dev->rotator_lock);
@@ -1391,6 +1485,8 @@
msm_bus_scale_client_update_request(msm_rotator_dev->bus_client_handle,
0);
#endif
+ if (msm_rotator_dev->sec_mapped)
+ unmap_sec_resource(msm_rotator_dev);
mutex_unlock(&msm_rotator_dev->rotator_lock);
return rc;
}