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

Commit e12864cd authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: smmu: Unmap secure buffers in secure camera use case" into... 

Merge "msm: camera: smmu: Unmap secure buffers in secure camera use case" into camera-kernel.lnx.4.0
parents 3e949eb2 6fb7609c

drivers/cam_smmu/cam_smmu_api.c

+22 −2
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ struct cam_dma_buff_info { 


struct cam_sec_buff_info {

	struct dma_buf *buf;

	struct dma_buf_attachment *attach;

	struct sg_table *table;

	enum dma_data_direction dir;

	int ref_count;

	dma_addr_t paddr;
@@ -2876,6 +2878,8 @@ static int cam_smmu_map_stage2_buffer_and_add_to_list(int idx, int ion_fd, 
	mapping_info->dir = dma_dir;

	mapping_info->ref_count = 1;

	mapping_info->buf = dmabuf;

	mapping_info->attach = attach;

	mapping_info->table = table;



	CAM_DBG(CAM_SMMU, "idx=%d, ion_fd=%d, dev=%pK, paddr=%pK, len=%u",

			idx, ion_fd,
@@ -2976,11 +2980,27 @@ static int cam_smmu_secure_unmap_buf_and_remove_from_list( 
		struct cam_sec_buff_info *mapping_info,

		int idx)

{

	if (!mapping_info) {

		CAM_ERR(CAM_SMMU, "Error: List doesn't exist");

	if ((!mapping_info->buf) || (!mapping_info->table) ||

		(!mapping_info->attach)) {

		CAM_ERR(CAM_SMMU, "Error: Invalid params dev = %pK, table = %pK",

			(void *)iommu_cb_set.cb_info[idx].dev,

			(void *)mapping_info->table);

		CAM_ERR(CAM_SMMU, "Error:dma_buf = %pK, attach = %pK\n",

			(void *)mapping_info->buf,

			(void *)mapping_info->attach);

		return -EINVAL;

	}



	/* skip cache operations */

	mapping_info->attach->dma_map_attrs |= DMA_ATTR_SKIP_CPU_SYNC;



	/* iommu buffer clean up */

	dma_buf_unmap_attachment(mapping_info->attach,

		mapping_info->table, mapping_info->dir);

	dma_buf_detach(mapping_info->buf, mapping_info->attach);

	dma_buf_put(mapping_info->buf);

	mapping_info->buf = NULL;



	list_del_init(&mapping_info->list);



	CAM_DBG(CAM_SMMU, "unmap fd: %d, idx : %d", mapping_info->ion_fd, idx);