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/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 4b58798..09e4dd0 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.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
@@ -5593,6 +5593,16 @@
CLK_LOOKUP("krait1_mclk", krait1_m_clk, ""),
CLK_LOOKUP("krait2_mclk", krait2_m_clk, ""),
CLK_LOOKUP("krait3_mclk", krait3_m_clk, ""),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "mdp.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "mdp.0"),
};
static struct clk_lookup msm_clocks_8960_common[] __initdata = {
@@ -5916,6 +5926,16 @@
CLK_LOOKUP("q6sw_clk", q6sw_clk, ""),
CLK_LOOKUP("q6fw_clk", q6fw_clk, ""),
CLK_LOOKUP("q6_func_clk", q6_func_clk, ""),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "mdp.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "mdp.0"),
};
static struct clk_lookup msm_clocks_8960_only[] __initdata = {
@@ -6246,6 +6266,17 @@
CLK_LOOKUP("q6sw_clk", q6sw_clk, ""),
CLK_LOOKUP("q6fw_clk", q6fw_clk, ""),
CLK_LOOKUP("q6_func_clk", q6_func_clk, ""),
+
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "msm_rotator.0"),
+ CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu0_clk", vcodec_axi_a_clk.c, "mdp.0"),
+ CLK_LOOKUP("vcodec_iommu1_clk", vcodec_axi_b_clk.c, "mdp.0"),
+ CLK_LOOKUP("smmu_iface_clk", smmu_p_clk.c, "mdp.0"),
};
/*
* Miscellaneous clock register initializations
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;
}
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 31f98be..7116922 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -49,6 +49,18 @@
static struct clk *mdp_clk;
static struct clk *mdp_pclk;
static struct clk *mdp_lut_clk;
+
+struct res_mmu_clk {
+ char *mmu_clk_name;
+ struct clk *mmu_clk;
+};
+
+static struct res_mmu_clk mdp_sec_mmu_clks[] = {
+ {"mdp_iommu_clk"}, {"rot_iommu_clk"},
+ {"vcodec_iommu0_clk"}, {"vcodec_iommu1_clk"},
+ {"smmu_iface_clk"}
+};
+
int mdp_rev;
int mdp_iommu_split_domain;
u32 mdp_max_clk = 266667000;
@@ -192,6 +204,44 @@
}
return base;
}
+int mdp_enable_iommu_clocks(void)
+{
+ int ret = 0, i;
+ for (i = 0; i < ARRAY_SIZE(mdp_sec_mmu_clks); i++) {
+ mdp_sec_mmu_clks[i].mmu_clk = clk_get(&mdp_init_pdev->dev,
+ mdp_sec_mmu_clks[i].mmu_clk_name);
+ if (IS_ERR(mdp_sec_mmu_clks[i].mmu_clk)) {
+ pr_err(" %s: Get failed for clk %s", __func__,
+ mdp_sec_mmu_clks[i].mmu_clk_name);
+ ret = PTR_ERR(mdp_sec_mmu_clks[i].mmu_clk);
+ break;
+ }
+ ret = clk_prepare_enable(mdp_sec_mmu_clks[i].mmu_clk);
+ if (ret) {
+ clk_put(mdp_sec_mmu_clks[i].mmu_clk);
+ mdp_sec_mmu_clks[i].mmu_clk = NULL;
+ }
+ }
+ if (ret) {
+ for (i--; i >= 0; i--) {
+ clk_disable_unprepare(mdp_sec_mmu_clks[i].mmu_clk);
+ clk_put(mdp_sec_mmu_clks[i].mmu_clk);
+ mdp_sec_mmu_clks[i].mmu_clk = NULL;
+ }
+ }
+ return ret;
+}
+
+int mdp_disable_iommu_clocks(void)
+{
+ int i;
+ for (i = 0; i < ARRAY_SIZE(mdp_sec_mmu_clks); i++) {
+ clk_disable_unprepare(mdp_sec_mmu_clks[i].mmu_clk);
+ clk_put(mdp_sec_mmu_clks[i].mmu_clk);
+ mdp_sec_mmu_clks[i].mmu_clk = NULL;
+ }
+ return 0;
+}
static uint32_t mdp_pp_block2hist_lut(uint32_t block)
{
diff --git a/drivers/video/msm/mdp.h b/drivers/video/msm/mdp.h
index 9cc8fe8..7bcea6e 100644
--- a/drivers/video/msm/mdp.h
+++ b/drivers/video/msm/mdp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2012, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2008-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
@@ -873,6 +873,8 @@
void __mdp_histogram_kickoff(struct mdp_hist_mgmt *mgmt);
void __mdp_histogram_reset(struct mdp_hist_mgmt *mgmt);
void mdp_footswitch_ctrl(boolean on);
+int mdp_enable_iommu_clocks(void);
+int mdp_disable_iommu_clocks(void);
#ifdef CONFIG_FB_MSM_MDP303
static inline void mdp4_dsi_cmd_dma_busy_wait(struct msm_fb_data_type *mfd)
diff --git a/drivers/video/msm/mdp4.h b/drivers/video/msm/mdp4.h
index ba099c3..c209ea0 100644
--- a/drivers/video/msm/mdp4.h
+++ b/drivers/video/msm/mdp4.h
@@ -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
@@ -965,5 +965,13 @@
void mdp4_wfd_init(int cndx);
int mdp4_wfd_pipe_commit(struct msm_fb_data_type *mfd, int cndx, int wait);
#endif
-
+#ifdef CONFIG_FB_MSM_OVERLAY
+int mdp4_unmap_sec_resource(void);
+#else
+static inline void mdp4_unmap_sec_resource(void);
+{
+ /* empty */
+ return 0;
+}
+#endif
#endif /* MDP_H */
diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c
index 9b05d2a..c76a13b 100644
--- a/drivers/video/msm/mdp4_overlay.c
+++ b/drivers/video/msm/mdp4_overlay.c
@@ -58,6 +58,9 @@
uint32 mixer0_played;
uint32 mixer1_played;
uint32 mixer2_played;
+ uint32 sec_mapped;
+ uint32 mmu_clk_on;
+ uint32 sec_active;
} mdp4_overlay_db = {
.cs_controller = CS_CONTROLLER_0,
.plist = {
@@ -119,6 +122,43 @@
static struct ion_client *display_iclient;
+static int mdp4_map_sec_resource(void)
+{
+ int ret = 0;
+ if (ctrl->sec_mapped)
+ return 0;
+
+ ret = mdp_enable_iommu_clocks();
+ 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
+ ctrl->sec_mapped = 1;
+ mdp_disable_iommu_clocks();
+ return ret;
+}
+
+int mdp4_unmap_sec_resource(void)
+{
+ int ret = 0;
+ if ((ctrl->sec_mapped == 0) || (ctrl->sec_active))
+ return 0;
+
+ ret = mdp_enable_iommu_clocks();
+ if (ret) {
+ pr_err("IOMMU clock enabled failed while close\n");
+ return ret;
+ }
+ msm_ion_unsecure_heap(ION_HEAP(ION_CP_MM_HEAP_ID));
+ ctrl->sec_mapped = 0;
+ mdp_disable_iommu_clocks();
+ return ret;
+}
/*
* mdp4_overlay_iommu_unmap_freelist()
@@ -3110,6 +3150,10 @@
}
}
+ if (pipe->flags & MDP_SECURE_OVERLAY_SESSION) {
+ mdp4_map_sec_resource();
+ ctrl->sec_active = TRUE;
+ }
mdp4_stat.overlay_set[pipe->mixer_num]++;
if (pipe->flags & MDP_OVERLAY_PP_CFG_EN) {
@@ -3217,6 +3261,8 @@
mdp4_stat.overlay_unset[pipe->mixer_num]++;
+ if (pipe->flags & MDP_SECURE_OVERLAY_SESSION)
+ ctrl->sec_active = FALSE;
mdp4_overlay_pipe_free(pipe);
mutex_unlock(&mfd->dma->ov_mutex);
@@ -3543,7 +3589,7 @@
msm_fb_signal_timeline(mfd);
mdp4_overlay_mdp_perf_upd(mfd, 0);
-
+ mdp4_unmap_sec_resource();
mutex_unlock(&mfd->dma->ov_mutex);
return ret;
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index 5922696..39354d1 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -1985,6 +1985,9 @@
mdp_dma_pan_update(info);
msm_fb_signal_timeline(mfd);
+ if (mdp4_unmap_sec_resource())
+ pr_err("%s: unmap secure res failed\n", __func__);
+
up(&msm_fb_pan_sem);
if (unset_bl_level && !bl_updated) {