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

Commit 4f8de5b0 authored by Lakshmi Narayana Kalavala's avatar Lakshmi Narayana Kalavala
Browse files

msm: camera2: cpp: Add IOMMU Attach and Detach IOCTL for cpp 



Add new IOCTL for IOMMU attach and detach for cpp, So it
can be called in stream ON/OFF to avoid multiple attach
in secure camera use case

Change-Id: I94427a9dab84e52d6c36820fe6061734edd41ea9
Signed-off-by: default avatarAzam Sadiq Pasha Kapatrala Syed <akapatra@codeaurora.org>
Signed-off-by: default avatarLakshmi Narayana Kalavala <lkalaval@codeaurora.org>
parent 718daa02

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+37 −4
Original line number Diff line number Diff line
@@ -969,7 +969,6 @@ static int cpp_open_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
			return rc;

		}



		iommu_attach_device(cpp_dev->domain, cpp_dev->iommu_ctx);

		cpp_init_mem(cpp_dev);

		cpp_dev->state = CPP_STATE_IDLE;

	}
@@ -1047,7 +1046,11 @@ static int cpp_close_node(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
		msm_camera_io_w(0x0, cpp_dev->base + MSM_CPP_MICRO_CLKEN_CTL);

		msm_cpp_clear_timer(cpp_dev);

		cpp_deinit_mem(cpp_dev);

		iommu_detach_device(cpp_dev->domain, cpp_dev->iommu_ctx);

		if (cpp_dev->iommu_state == CPP_IOMMU_STATE_ATTACHED) {

			iommu_detach_device(cpp_dev->domain,

				cpp_dev->iommu_ctx);

			cpp_dev->iommu_state = CPP_IOMMU_STATE_DETACHED;

		}

		cpp_release_hardware(cpp_dev);

		msm_cpp_empty_list(processing_q, list_frame);

		msm_cpp_empty_list(eventData_q, list_eventdata);
@@ -1719,10 +1722,11 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd, 
		uint32_t identity;

		struct msm_cpp_buff_queue_info_t *buff_queue_info;

		CPP_DBG("VIDIOC_MSM_CPP_DEQUEUE_STREAM_BUFF_INFO\n");



		if ((ioctl_ptr->len == 0) ||

			(ioctl_ptr->len > sizeof(uint32_t)))

		    (ioctl_ptr->len > sizeof(uint32_t))) {

			mutex_unlock(&cpp_dev->mutex);

			return -EINVAL;

		}



		rc = (copy_from_user(&identity,

				(void __user *)ioctl_ptr->ioctl_ptr,
@@ -1909,6 +1913,34 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd, 
	default:

		pr_err_ratelimited("invalid value: cmd=0x%x\n", cmd);

		break;

	case VIDIOC_MSM_CPP_IOMMU_ATTACH: {

		if (cpp_dev->iommu_state == CPP_IOMMU_STATE_DETACHED) {

			rc = iommu_attach_device(cpp_dev->domain,

				cpp_dev->iommu_ctx);

			if (rc < 0) {

				pr_err("%s:%dError iommu_attach_device failed\n",

					__func__, __LINE__);

				rc = -EINVAL;

			}

			cpp_dev->iommu_state = CPP_IOMMU_STATE_ATTACHED;

		} else {

			pr_err("%s:%d IOMMMU attach triggered in invalid state\n",

				__func__, __LINE__);

			rc = -EINVAL;

		}

		break;

	}

	case VIDIOC_MSM_CPP_IOMMU_DETACH: {

		if (cpp_dev->iommu_state == CPP_IOMMU_STATE_ATTACHED) {

			iommu_detach_device(cpp_dev->domain,

				cpp_dev->iommu_ctx);

			cpp_dev->iommu_state = CPP_IOMMU_STATE_DETACHED;

		} else {

			pr_err("%s:%d IOMMMU attach triggered in invalid state\n",

				__func__, __LINE__);

		}

		break;

	}

	}

	mutex_unlock(&cpp_dev->mutex);

	CPP_DBG("X\n");
@@ -2530,6 +2562,7 @@ static int cpp_probe(struct platform_device *pdev) 
	INIT_WORK((struct work_struct *)cpp_dev->work, msm_cpp_do_timeout_work);

	cpp_dev->cpp_open_cnt = 0;

	cpp_dev->is_firmware_loaded = 0;

	cpp_dev->iommu_state = CPP_IOMMU_STATE_DETACHED;

	cpp_timer.data.cpp_dev = cpp_dev;

	atomic_set(&cpp_timer.used, 0);

	cpp_dev->fw_name_bin = NULL;

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.h

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,11 @@ enum cpp_state { 
	CPP_STATE_OFF,

};



enum cpp_iommu_state {

	CPP_IOMMU_STATE_DETACHED,

	CPP_IOMMU_STATE_ATTACHED,

};



enum msm_queue {

	MSM_CAM_Q_CTRL,     /* control command or control command status */

	MSM_CAM_Q_VFE_EVT,  /* adsp event */
@@ -180,6 +185,7 @@ struct cpp_device { 
	struct regulator *fs_cpp;

	struct mutex mutex;

	enum cpp_state state;

	enum cpp_iommu_state iommu_state;

	uint8_t is_firmware_loaded;

	char *fw_name_bin;

	struct workqueue_struct *timer_wq;

include/media/msmb_camera.h

+9 −0
Original line number Diff line number Diff line
@@ -168,4 +168,13 @@ struct msm_v4l2_format_data { 
/* Bayer hist stats */

#define MSM_V4L2_PIX_FMT_STATS_BHST v4l2_fourcc('B', 'H', 'S', 'T')



enum smmu_attach_mode {

	NON_SECURE_MODE,

	SECURE_MODE,

};



struct msm_camera_smmu_attach_type {

	enum smmu_attach_mode attach;

};



#endif /* __LINUX_MSMB_CAMERA_H */

include/media/msmb_pproc.h

+7 −0
Original line number Diff line number Diff line
@@ -243,6 +243,13 @@ struct msm_pproc_queue_buf_info { 
#define VIDIOC_MSM_CPP_POP_STREAM_BUFFER \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 17, struct msm_camera_v4l2_ioctl_t)



#define VIDIOC_MSM_CPP_IOMMU_ATTACH \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 18, struct msm_camera_v4l2_ioctl_t)



#define VIDIOC_MSM_CPP_IOMMU_DETACH \

	_IOWR('V', BASE_VIDIOC_PRIVATE + 19, struct msm_camera_v4l2_ioctl_t)





#define V4L2_EVENT_CPP_FRAME_DONE  (V4L2_EVENT_PRIVATE_START + 0)

#define V4L2_EVENT_VPE_FRAME_DONE  (V4L2_EVENT_PRIVATE_START + 1)