Merge "disp: add shmbridge support in sde and rotator" (857ba6ee) · Commits · e / devices / android_kernel_fairphone_FP5

msm/sde/sde_kms.c

+33 −14

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@

		#include <soc/qcom/scm.h>
		#include "soc/qcom/secure_buffer.h"
		#include "soc/qcom/qtee_shmbridge.h"

		#define CREATE_TRACE_POINTS
		#include "sde_trace.h"
		@@ -270,6 +271,8 @@ static int _sde_kms_scm_call(struct sde_kms *sde_kms, int vmid)
		uint32_t mem_protect_sd_ctrl_id = MEM_PROTECT_SD_CTRL_SWITCH;
		struct sde_mdss_cfg *sde_cfg = sde_kms->catalog;
		int ret = 0, i;
		struct qtee_shm shm;
		bool qtee_en = qtee_shmbridge_is_enabled();

		num_sids = sde_cfg->sec_sid_mask_count;
		if (!num_sids) {
		@@ -277,34 +280,50 @@ static int _sde_kms_scm_call(struct sde_kms *sde_kms, int vmid)
		return -EINVAL;
		}

		if (qtee_en) {
		ret = qtee_shmbridge_allocate_shm(num_sids * sizeof(uint32_t),
		&shm);
		if (ret)
		return -ENOMEM;

		sec_sid = (uint32_t *) shm.paddr;
		desc.args[1] = shm.paddr;
		desc.args[2] = shm.size;
		} else {
		sec_sid = kcalloc(num_sids, sizeof(uint32_t), GFP_KERNEL);
		if (!sec_sid)
		return -ENOMEM;

		desc.args[1] = SCM_BUFFER_PHYS(sec_sid);
		desc.args[2] = sizeof(uint32_t) * num_sids;
		}

		desc.arginfo = SCM_ARGS(4, SCM_VAL, SCM_RW, SCM_VAL, SCM_VAL);
		desc.args[0] = MDP_DEVICE_ID;
		desc.args[3] = vmid;

		for (i = 0; i < num_sids; i++) {
		sec_sid[i] = sde_cfg->sec_sid_mask[i];
		SDE_DEBUG("sid_mask[%d]: %d\n", i, sec_sid[i]);
		}
		dmac_flush_range(sec_sid, sec_sid + num_sids);

		SDE_DEBUG("calling scm_call for vmid 0x%x, num_sids %d",
		vmid, num_sids);

		desc.arginfo = SCM_ARGS(4, SCM_VAL, SCM_RW, SCM_VAL, SCM_VAL);
		desc.args[0] = MDP_DEVICE_ID;
		desc.args[1] = SCM_BUFFER_PHYS(sec_sid);
		desc.args[2] = sizeof(uint32_t) * num_sids;
		desc.args[3] = vmid;
		SDE_DEBUG("calling scm_call for vmid 0x%x, num_sids %d, qtee_en %d",
		vmid, num_sids, qtee_en);

		ret = scm_call2(SCM_SIP_FNID(SCM_SVC_MP,
		mem_protect_sd_ctrl_id), &desc);
		if (ret)
		SDE_ERROR("Error:scm_call2, vmid %lld, ret%d\n",
		desc.args[3], ret);
		SDE_EVT32(mem_protect_sd_ctrl_id,
		desc.args[0], desc.args[3], num_sids, ret);
		SDE_EVT32(mem_protect_sd_ctrl_id, desc.args[0], desc.args[2],
		desc.args[3], qtee_en, num_sids, ret);

		if (qtee_en)
		qtee_shmbridge_free_shm(&shm);
		else
		kfree(sec_sid);

		return ret;
		}

rotator/sde_rotator_core.c

+35 −18

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <soc/qcom/secure_buffer.h>
		#include <asm/cacheflush.h>
		#include <uapi/linux/sched/types.h>
		#include <soc/qcom/qtee_shmbridge.h>

		#include "sde_rotator_base.h"
		#include "sde_rotator_core.h"
		@@ -593,18 +594,33 @@ static int sde_rotator_secure_session_ctrl(bool enable)
		struct scm_desc desc = {0};
		unsigned int resp = 0;
		int ret = 0;
		struct qtee_shm shm;
		bool qtee_en = qtee_shmbridge_is_enabled();

		if (test_bit(SDE_CAPS_SEC_ATTACH_DETACH_SMMU, mdata->sde_caps_map)) {

		desc.arginfo = SCM_ARGS(4, SCM_VAL, SCM_RW, SCM_VAL, SCM_VAL);
		desc.args[0] = SDE_ROTATOR_DEVICE;

		if (qtee_en) {
		ret = qtee_shmbridge_allocate_shm(sizeof(uint32_t),
		&shm);
		if (ret)
		return -ENOMEM;

		sid_info = (uint32_t *) shm.paddr;
		desc.args[1] = shm.paddr;
		desc.args[2] = shm.size;
		} else {
		sid_info = kzalloc(sizeof(uint32_t), GFP_KERNEL);
		if (!sid_info)
		return -ENOMEM;

		sid_info[0] = mdata->sde_smmu[SDE_IOMMU_DOMAIN_ROT_SECURE].sid;
		desc.arginfo = SCM_ARGS(4, SCM_VAL, SCM_RW, SCM_VAL, SCM_VAL);
		desc.args[0] = SDE_ROTATOR_DEVICE;
		desc.args[1] = SCM_BUFFER_PHYS(sid_info);
		desc.args[2] = sizeof(uint32_t);
		}

		sid_info[0] = mdata->sde_smmu[SDE_IOMMU_DOMAIN_ROT_SECURE].sid;

		if (!mdata->sec_cam_en && enable) {
		/*
		@@ -632,12 +648,11 @@ static int sde_rotator_secure_session_ctrl(bool enable)
		}

		SDEROT_DBG(
		"scm(1) sid0x%x dev0x%llx vmid0x%llx ret%d resp%x\n",
		"scm(1) sid0x%x dev0x%llx vmid0x%llx qtee_en%d ret%d resp%x\n",
		sid_info[0], desc.args[0], desc.args[3],
		ret, resp);
		SDEROT_EVTLOG(1, sid_info, sid_info[0],
		desc.args[0], desc.args[3],
		ret, resp);
		qtee_en, ret, resp);
		SDEROT_EVTLOG(1, sid_info, sid_info[0], desc.args[0],
		desc.args[3], qtee_en, ret, resp);
		} else if (mdata->sec_cam_en && !enable) {
		/*
		* Disable secure camera operation
		@@ -653,22 +668,24 @@ static int sde_rotator_secure_session_ctrl(bool enable)
		resp = desc.ret[0];

		SDEROT_DBG(
		"scm(0) sid0x%x dev0x%llx vmid0x%llx ret%d resp%d\n",
		"scm(0) sid0x%x dev0x%llx vmid0x%llx qtee_en%d ret%d resp%d\n",
		sid_info[0], desc.args[0], desc.args[3],
		ret, resp);
		qtee_en, ret, resp);

		/* force smmu to reattach */
		sde_smmu_secure_ctrl(1);

		SDEROT_EVTLOG(0, sid_info, sid_info[0],
		desc.args[0], desc.args[3],
		ret, resp);
		SDEROT_EVTLOG(0, sid_info, sid_info[0], desc.args[0],
		desc.args[3], qtee_en, ret, resp);
		}
		} else {
		return 0;
		}

		end:
		if (qtee_en)
		qtee_shmbridge_free_shm(&shm);
		else
		kfree(sid_info);

		if (ret)