Merge "msm: camera: smmu: Add API to return memory region information" into msm-4.9 (01f41f96) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.c

+81 −5

Original line number	Diff line number	Diff line
		@@ -94,11 +94,6 @@ struct scratch_mapping {
		dma_addr_t base;
		};

		struct cam_smmu_region_info {
		dma_addr_t iova_start;
		size_t iova_len;
		};

		struct cam_context_bank_info {
		struct device *dev;
		struct dma_iommu_mapping *mapping;
		@@ -994,6 +989,87 @@ int cam_smmu_dealloc_firmware(int32_t smmu_hdl)
		}
		EXPORT_SYMBOL(cam_smmu_dealloc_firmware);

		int cam_smmu_get_region_info(int32_t smmu_hdl,
		enum cam_smmu_region_id region_id,
		struct cam_smmu_region_info *region_info)
		{
		int32_t idx;
		struct cam_context_bank_info *cb = NULL;

		if (!region_info) {
		pr_err("Invalid region_info pointer\n");
		return -EINVAL;
		}

		if (smmu_hdl == HANDLE_INIT) {
		pr_err("Invalid handle\n");
		return -EINVAL;
		}

		idx = GET_SMMU_TABLE_IDX(smmu_hdl);
		if (idx < 0 \|\| idx >= iommu_cb_set.cb_num) {
		pr_err("Handle or index invalid. idx = %d hdl = %x\n",
		idx, smmu_hdl);
		return -EINVAL;
		}

		mutex_lock(&iommu_cb_set.cb_info[idx].lock);
		cb = &iommu_cb_set.cb_info[idx];
		if (!cb) {
		pr_err("SMMU context bank pointer invalid\n");
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -EINVAL;
		}

		switch (region_id) {
		case CAM_SMMU_REGION_FIRMWARE:
		if (!cb->firmware_support) {
		pr_err("Firmware not supported\n");
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -ENODEV;
		}
		region_info->iova_start = cb->firmware_info.iova_start;
		region_info->iova_len = cb->firmware_info.iova_len;
		break;
		case CAM_SMMU_REGION_SHARED:
		if (!cb->shared_support) {
		pr_err("Shared mem not supported\n");
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -ENODEV;
		}
		region_info->iova_start = cb->shared_info.iova_start;
		region_info->iova_len = cb->shared_info.iova_len;
		break;
		case CAM_SMMU_REGION_SCRATCH:
		if (!cb->scratch_buf_support) {
		pr_err("Scratch memory not supported\n");
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -ENODEV;
		}
		region_info->iova_start = cb->scratch_info.iova_start;
		region_info->iova_len = cb->scratch_info.iova_len;
		break;
		case CAM_SMMU_REGION_IO:
		if (!cb->io_support) {
		pr_err("IO memory not supported\n");
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -ENODEV;
		}
		region_info->iova_start = cb->io_info.iova_start;
		region_info->iova_len = cb->io_info.iova_len;
		break;
		default:
		pr_err("Invalid region id: %d for smmu hdl: %X\n",
		smmu_hdl, region_id);
		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return -EINVAL;
		}

		mutex_unlock(&iommu_cb_set.cb_info[idx].lock);
		return 0;
		}
		EXPORT_SYMBOL(cam_smmu_get_region_info);

		static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd,
		enum dma_data_direction dma_dir, dma_addr_t *paddr_ptr,
		size_t *len_ptr,

drivers/media/platform/msm/camera/cam_smmu/cam_smmu_api.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,17 @@ enum cam_smmu_region_id {
		CAM_SMMU_REGION_IO
		};

		/**
		* @brief : Structure to store region information
		*
		* @param iova_start : Start address of region
		* @param iova_len : length of region
		*/
		struct cam_smmu_region_info {
		dma_addr_t iova_start;
		size_t iova_len;
		};

		/**
		* @brief : Gets an smmu handle
		*
		@@ -252,4 +263,17 @@ int cam_smmu_alloc_firmware(int32_t smmu_hdl,
		* @return Status of operation. Negative in case of error. Zero otherwise.
		*/
		int cam_smmu_dealloc_firmware(int32_t smmu_hdl);

		/**
		* @brief Gets region information specified by smmu handle and region id
		*
		* @param smmu_hdl: SMMU handle identifying the context bank
		* @param region_id: Region id for which information is desired
		* @param region_info: Struct populated with region information
		*
		* @return Status of operation. Negative in case of error. Zero otherwise.
		*/
		int cam_smmu_get_region_info(int32_t smmu_hdl,
		enum cam_smmu_region_id region_id,
		struct cam_smmu_region_info *region_info);
		#endif /* _CAM_SMMU_API_H_ */