Merge "ion: Remove usage hint from secure APIs" (4a38ca25) · Commits · e / devices / android_kernel_sony_msm8994

drivers/staging/android/ion/ion_cma_secure_heap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -532,7 +532,7 @@ static int ion_secure_cma_allocate(struct ion_heap *heap,
		} else {
		trace_ion_cp_secure_buffer_start(heap->name, len, align,
		flags);
		ret = msm_ion_secure_table(buf->table, 0, 0);
		ret = msm_ion_secure_table(buf->table);
		trace_ion_cp_secure_buffer_end(heap->name, len, align,
		flags);
		}

drivers/staging/android/ion/msm/msm_ion.h

+2 −5

Original line number	Diff line number	Diff line
		@@ -150,8 +150,7 @@ int ion_handle_get_size(struct ion_client client, struct ion_handle handle,
		int msm_ion_do_cache_op(struct ion_client client, struct ion_handle handle,
		void *vaddr, unsigned long len, unsigned int cmd);

		int msm_ion_secure_table(struct sg_table *table, enum cp_mem_usage usage,
		int flags);
		int msm_ion_secure_table(struct sg_table *table);

		int msm_ion_unsecure_table(struct sg_table *table);
		#else
		@@ -173,9 +172,7 @@ static inline int msm_ion_do_cache_op(struct ion_client *client,
		return -ENODEV;
		}

		static inline int msm_ion_secure_table(struct sg_table *table,
		enum cp_mem_usage usage,
		int flags)
		static inline int msm_ion_secure_table(struct sg_table *table)
		{
		return -ENODEV;
		}

drivers/staging/android/ion/msm/secure_buffer.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ static struct secure_meta secure_meta_lookup(struct sg_table table)
		static int secure_buffer_change_chunk(u32 chunks,
		u32 nchunks,
		u32 chunk_size,
		enum cp_mem_usage usage,
		int lock)
		{
		struct cp2_lock_req request;
		@@ -114,7 +113,8 @@ static int secure_buffer_change_chunk(u32 chunks,
		desc.args[0] = request.chunks.chunk_list = chunks;
		desc.args[1] = request.chunks.chunk_list_size = nchunks;
		desc.args[2] = request.chunks.chunk_size = chunk_size;
		desc.args[3] = request.mem_usage = usage;
		/* Usage is now always 0 */
		desc.args[3] = request.mem_usage = 0;
		desc.args[4] = request.lock = lock;
		desc.args[5] = 0;
		desc.arginfo = SCM_ARGS(6, SCM_RW, SCM_VAL, SCM_VAL, SCM_VAL, SCM_VAL,
		@@ -137,9 +137,7 @@ static int secure_buffer_change_chunk(u32 chunks,



		static int secure_buffer_change_table(struct sg_table *table,
		enum cp_mem_usage usage,
		int lock)
		static int secure_buffer_change_table(struct sg_table *table, int lock)
		{
		int i, j;
		int ret = -EINVAL;
		@@ -190,7 +188,7 @@ static int secure_buffer_change_table(struct sg_table *table,
		dmac_flush_range(chunk_list, chunk_list + chunk_list_len);

		ret = secure_buffer_change_chunk(virt_to_phys(chunk_list),
		nchunks, V2_CHUNK_SIZE, usage, lock);
		nchunks, V2_CHUNK_SIZE, lock);

		kfree(chunk_list);
		}
		@@ -198,8 +196,7 @@ static int secure_buffer_change_table(struct sg_table *table,
		return ret;
		}

		int msm_ion_secure_table(struct sg_table *table, enum cp_mem_usage usage,
		int flags)
		int msm_ion_secure_table(struct sg_table *table)
		{
		struct secure_meta *meta;
		int ret;
		@@ -219,10 +216,9 @@ int msm_ion_secure_table(struct sg_table *table, enum cp_mem_usage usage,
		}

		meta->table = table;
		meta->usage = usage;
		kref_init(&meta->ref);

		ret = secure_buffer_change_table(table, usage, 1);
		ret = secure_buffer_change_table(table, 1);
		if (!ret)
		secure_meta_add(meta);
		else
		@@ -241,7 +237,7 @@ static void msm_secure_buffer_release(struct kref *kref)
		ref);

		rb_erase(&meta->node, &secure_root);
		secure_buffer_change_table(meta->table, meta->usage, 0);
		secure_buffer_change_table(meta->table, 0);
		kfree(meta);
		}