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

Commit 3af1a33c authored by Liam Mark's avatar Liam Mark
Browse files

Revert "staging: android: ion: Remove crufty cache support" 



This reverts commit 5dc3bafb ("staging: android: ion: Remove crufty
cache support").
Revert removing of ION cache support since cache support is still required
for memory allocated from buddy.

Change-Id: I51a467099060d9626497c3f7800b708f82e9d283
Signed-off-by: default avatarLiam Mark <lmark@codeaurora.org>
parent 9fd847f2

drivers/staging/android/ion/ion.c

+40 −0
Original line number Diff line number Diff line
@@ -290,6 +290,22 @@ static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, 
	dma_unmap_sg(attachment->dev, table->sgl, table->nents, direction);

}



void ion_pages_sync_for_device(struct device *dev, struct page *page,

			       size_t size, enum dma_data_direction dir)

{

	struct scatterlist sg;



	sg_init_table(&sg, 1);

	sg_set_page(&sg, page, size, 0);

	/*

	 * This is not correct - sg_dma_address needs a dma_addr_t that is valid

	 * for the targeted device, but this works on the currently targeted

	 * hardware.

	 */

	sg_dma_address(&sg) = page_to_phys(page);

	dma_sync_sg_for_device(dev, &sg, 1, dir);

}



static int ion_mmap(struct dma_buf *dmabuf, struct vm_area_struct *vma)

{

	struct ion_buffer *buffer = dmabuf->priv;
@@ -456,6 +472,30 @@ int ion_alloc(size_t len, unsigned int heap_id_mask, unsigned int flags) 
	return fd;

}



int ion_sync_for_device(struct ion_client *client, int fd)

{

	struct dma_buf *dmabuf;

	struct ion_buffer *buffer;



	dmabuf = dma_buf_get(fd);

	if (IS_ERR(dmabuf))

		return PTR_ERR(dmabuf);



	/* if this memory came from ion */

	if (dmabuf->ops != &dma_buf_ops) {

		pr_err("%s: can not sync dmabuf from another exporter\n",

		       __func__);

		dma_buf_put(dmabuf);

		return -EINVAL;

	}

	buffer = dmabuf->priv;



	dma_sync_sg_for_device(NULL, buffer->sg_table->sgl,

			       buffer->sg_table->nents, DMA_BIDIRECTIONAL);

	dma_buf_put(dmabuf);

	return 0;

}



int ion_query_heaps(struct ion_heap_query *query)

{

	struct ion_device *dev = internal_dev;

drivers/staging/android/ion/ion.h

+12 −0
Original line number Diff line number Diff line
@@ -405,8 +405,20 @@ void ion_page_pool_free(struct ion_page_pool *pool, struct page *page); 
int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,

			  int nr_to_scan);



/**

 * ion_pages_sync_for_device - cache flush pages for use with the specified

 *                             device

 * @dev:		the device the pages will be used with

 * @page:		the first page to be flushed

 * @size:		size in bytes of region to be flushed

 * @dir:		direction of dma transfer

 */

void ion_pages_sync_for_device(struct device *dev, struct page *page,

			       size_t size, enum dma_data_direction dir);



long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);



int ion_query_heaps(struct ion_heap_query *query);

int ion_sync_for_device(struct ion_client *client, int fd);



#endif /* _ION_H */

drivers/staging/android/ion/ion_carveout_heap.c

+6 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ static void ion_carveout_heap_free(struct ion_buffer *buffer) 


	ion_heap_buffer_zero(buffer);



	if (ion_buffer_cached(buffer))

		dma_sync_sg_for_device(NULL, table->sgl, table->nents,

				       DMA_BIDIRECTIONAL);



	ion_carveout_free(heap, paddr, buffer->size);

	sg_free_table(table);

	kfree(table);
@@ -123,6 +127,8 @@ struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) 
	page = pfn_to_page(PFN_DOWN(heap_data->base));

	size = heap_data->size;



	ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL);



	ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL));

	if (ret)

		return ERR_PTR(ret);

drivers/staging/android/ion/ion_chunk_heap.c

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer) 


	ion_heap_buffer_zero(buffer);



	if (ion_buffer_cached(buffer))

		dma_sync_sg_for_device(NULL, table->sgl, table->nents,

				       DMA_BIDIRECTIONAL);



	for_each_sg(table->sgl, sg, table->nents, i) {

		gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),

			      sg->length);
@@ -127,6 +131,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) 
	page = pfn_to_page(PFN_DOWN(heap_data->base));

	size = heap_data->size;



	ion_pages_sync_for_device(NULL, page, size, DMA_BIDIRECTIONAL);



	ret = ion_heap_pages_zero(page, size, pgprot_writecombine(PAGE_KERNEL));

	if (ret)

		return ERR_PTR(ret);

drivers/staging/android/ion/ion_page_pool.c

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool) 


	if (!page)

		return NULL;

	if (!pool->cached)

		ion_pages_sync_for_device(NULL, page, PAGE_SIZE << pool->order,

					  DMA_BIDIRECTIONAL);

	return page;

}