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

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

Merge "msm: camera: memmgr: Add support to disable DelayedUnmap" into camera-kernel.lnx.3.1

parents 6d2403cc 7233e788

drivers/cam_req_mgr/cam_mem_mgr.c

+5 −0
Original line number Diff line number Diff line
@@ -505,12 +505,16 @@ static int cam_mem_util_map_hw_va(uint32_t flags, 
	int i;

	int rc = -1;

	int dir = cam_mem_util_get_dma_dir(flags);

	bool dis_delayed_unmap = false;



	if (dir < 0) {

		CAM_ERR(CAM_MEM, "fail to map DMA direction, dir=%d", dir);

		return dir;

	}



	if (flags & CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP)

		dis_delayed_unmap = true;



	CAM_DBG(CAM_MEM,

		"map_hw_va : fd = %d,  flags = 0x%x, dir=%d, num_hdls=%d",

		fd, flags, dir, num_hdls);
@@ -534,6 +538,7 @@ static int cam_mem_util_map_hw_va(uint32_t flags, 
		for (i = 0; i < num_hdls; i++) {

			rc = cam_smmu_map_user_iova(mmu_hdls[i],

				fd,

				dis_delayed_unmap,

				dir,

				(dma_addr_t *)hw_vaddr,

				len,

drivers/cam_smmu/cam_smmu_api.c

+22 −14
Original line number Diff line number Diff line
@@ -221,8 +221,9 @@ static struct cam_dma_buff_info *cam_smmu_find_mapping_by_virt_address(int idx, 
	dma_addr_t virt_addr);



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, enum cam_smmu_region_id region_id);

	bool dis_delayed_unmap, enum dma_data_direction dma_dir,

	dma_addr_t *paddr_ptr, size_t *len_ptr,

	enum cam_smmu_region_id region_id);



static int cam_smmu_map_kernel_buffer_and_add_to_list(int idx,

	struct dma_buf *buf, enum dma_data_direction dma_dir,
@@ -1722,7 +1723,7 @@ EXPORT_SYMBOL(cam_smmu_release_sec_heap); 
static int cam_smmu_map_buffer_validate(struct dma_buf *buf,

	int idx, enum dma_data_direction dma_dir, dma_addr_t *paddr_ptr,

	size_t *len_ptr, enum cam_smmu_region_id region_id,

	struct cam_dma_buff_info **mapping_info)

	bool dis_delayed_unmap, struct cam_dma_buff_info **mapping_info)

{

	struct dma_buf_attachment *attach = NULL;

	struct sg_table *table = NULL;
@@ -1797,6 +1798,7 @@ static int cam_smmu_map_buffer_validate(struct dma_buf *buf, 
		}

		iommu_cb_set.cb_info[idx].shared_mapping_size += *len_ptr;

	} else if (region_id == CAM_SMMU_REGION_IO) {

		if (!dis_delayed_unmap)

			attach->dma_map_attrs |= DMA_ATTR_DELAYED_UNMAP;



		table = dma_buf_map_attachment(attach, dma_dir);
@@ -1815,8 +1817,9 @@ static int cam_smmu_map_buffer_validate(struct dma_buf *buf, 
		goto err_unmap_sg;

	}



	CAM_DBG(CAM_SMMU, "iova=%pK, region_id=%d, paddr=%pK, len=%d",

		iova, region_id, *paddr_ptr, *len_ptr);

	CAM_DBG(CAM_SMMU,

		"iova=%pK, region_id=%d, paddr=%pK, len=%d, dma_map_attrs=%d",

		iova, region_id, *paddr_ptr, *len_ptr, attach->dma_map_attrs);



	if (table->sgl) {

		CAM_DBG(CAM_SMMU,
@@ -1884,8 +1887,9 @@ static int cam_smmu_map_buffer_validate(struct dma_buf *buf, 




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, enum cam_smmu_region_id region_id)

	bool dis_delayed_unmap, enum dma_data_direction dma_dir,

	dma_addr_t *paddr_ptr, size_t *len_ptr,

	enum cam_smmu_region_id region_id)

{

	int rc = -1;

	struct cam_dma_buff_info *mapping_info = NULL;
@@ -1895,7 +1899,7 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd, 
	buf = dma_buf_get(ion_fd);



	rc = cam_smmu_map_buffer_validate(buf, idx, dma_dir, paddr_ptr, len_ptr,

		region_id, &mapping_info);

		region_id, dis_delayed_unmap, &mapping_info);



	if (rc) {

		CAM_ERR(CAM_SMMU, "buffer validation failure");
@@ -1919,7 +1923,7 @@ static int cam_smmu_map_kernel_buffer_and_add_to_list(int idx, 
	struct cam_dma_buff_info *mapping_info = NULL;



	rc = cam_smmu_map_buffer_validate(buf, idx, dma_dir, paddr_ptr, len_ptr,

		region_id, &mapping_info);

		region_id, false, &mapping_info);



	if (rc) {

		CAM_ERR(CAM_SMMU, "buffer validation failure");
@@ -1956,6 +1960,11 @@ static int cam_smmu_unmap_buf_and_remove_from_list( 
		return -EINVAL;

	}



	CAM_DBG(CAM_SMMU,

		"region_id=%d, paddr=%pK, len=%d, dma_map_attrs=%d",

		mapping_info->region_id, mapping_info->paddr, mapping_info->len,

		mapping_info->attach->dma_map_attrs);



	if (mapping_info->region_id == CAM_SMMU_REGION_SHARED) {

		CAM_DBG(CAM_SMMU,

			"Removing SHARED buffer paddr = %pK, len = %zu",
@@ -1984,7 +1993,6 @@ static int cam_smmu_unmap_buf_and_remove_from_list( 
		iommu_cb_set.cb_info[idx].shared_mapping_size -=

			mapping_info->len;

	} else if (mapping_info->region_id == CAM_SMMU_REGION_IO) {

		mapping_info->attach->dma_map_attrs |= DMA_ATTR_DELAYED_UNMAP;

		iommu_cb_set.cb_info[idx].io_mapping_size -= mapping_info->len;

	}
@@ -2738,7 +2746,7 @@ static int cam_smmu_map_iova_validate_params(int handle, 
	return rc;

}



int cam_smmu_map_user_iova(int handle, int ion_fd,

int cam_smmu_map_user_iova(int handle, int ion_fd, bool dis_delayed_unmap,

	enum cam_smmu_map_dir dir, dma_addr_t *paddr_ptr,

	size_t *len_ptr, enum cam_smmu_region_id region_id)

{
@@ -2789,8 +2797,8 @@ int cam_smmu_map_user_iova(int handle, int ion_fd, 
		goto get_addr_end;

	}



	rc = cam_smmu_map_buffer_and_add_to_list(idx, ion_fd, dma_dir,

			paddr_ptr, len_ptr, region_id);

	rc = cam_smmu_map_buffer_and_add_to_list(idx, ion_fd,

		dis_delayed_unmap, dma_dir, paddr_ptr, len_ptr, region_id);

	if (rc < 0) {

		CAM_ERR(CAM_SMMU,

			"mapping or add list fail, idx=%d, fd=%d, region=%d, rc=%d",

drivers/cam_smmu/cam_smmu_api.h

+4 −3
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ int cam_smmu_ops(int handle, enum cam_smmu_ops_param op); 
 *

 * @param handle: Handle to identify the CAM SMMU client (VFE, CPP, FD etc.)

 * @param ion_fd: ION handle identifying the memory buffer.

 * @param dis_delayed_unmap: Whether to disable Delayed Unmap feature

 *                           for this mapping

 * @dir         : Mapping direction: which will traslate toDMA_BIDIRECTIONAL,

 *                DMA_TO_DEVICE or DMA_FROM_DEVICE

 * @dma_addr    : Pointer to physical address where mapped address will be
@@ -107,9 +109,8 @@ int cam_smmu_ops(int handle, enum cam_smmu_ops_param op); 
 * @len_ptr     : Length of buffer mapped returned by CAM SMMU driver.

 * @return Status of operation. Negative in case of error. Zero otherwise.

 */

int cam_smmu_map_user_iova(int handle,

	int ion_fd, enum cam_smmu_map_dir dir,

	dma_addr_t *dma_addr, size_t *len_ptr,

int cam_smmu_map_user_iova(int handle, int ion_fd, bool dis_delayed_unmap,

	enum cam_smmu_map_dir dir, dma_addr_t *dma_addr, size_t *len_ptr,

	enum cam_smmu_region_id region_id);



/**

include/uapi/media/cam_req_mgr.h

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ struct cam_req_mgr_link_control { 
#define CAM_MEM_FLAG_CACHE                      (1<<10)

#define CAM_MEM_FLAG_HW_SHARED_ACCESS           (1<<11)

#define CAM_MEM_FLAG_CDSP_OUTPUT                (1<<12)

#define CAM_MEM_FLAG_DISABLE_DELAYED_UNMAP      (1<<13)



#define CAM_MEM_MMU_MAX_HANDLE                  16