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

Commit 5dc3bafb authored by Laura Abbott's avatar Laura Abbott Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: Remove crufty cache support 



Now that we call dma_map in the dma_buf API callbacks there is no need
to use the existing cache APIs. Remove the sync ioctl and the existing
bad dma_sync calls. Explicit caching can be handled with the dma_buf
sync API.

Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0499a614

drivers/staging/android/ion/compat_ion.c

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ long compat_ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	case ION_IOC_SHARE:

	case ION_IOC_MAP:

	case ION_IOC_IMPORT:

	case ION_IOC_SYNC:

		return filp->f_op->unlocked_ioctl(filp, cmd,

						(unsigned long)compat_ptr(arg));

	default:

drivers/staging/android/ion/ion-ioctl.c

+0 −6
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static int validate_ioctl_arg(unsigned int cmd, union ion_ioctl_arg *arg) 
static unsigned int ion_ioctl_dir(unsigned int cmd)

{

	switch (cmd) {

	case ION_IOC_SYNC:

	case ION_IOC_FREE:

	case ION_IOC_CUSTOM:

		return _IOC_WRITE;
@@ -146,11 +145,6 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
			data.handle.handle = handle->id;

		break;

	}

	case ION_IOC_SYNC:

	{

		ret = ion_sync_for_device(client, data.fd.fd);

		break;

	}

	case ION_IOC_CUSTOM:

	{

		if (!dev->custom_ioctl)

drivers/staging/android/ion/ion.c

+0 −40
Original line number Diff line number Diff line
@@ -863,22 +863,6 @@ 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;
@@ -1097,30 +1081,6 @@ struct ion_handle *ion_import_dma_buf_fd(struct ion_client *client, int fd) 
}

EXPORT_SYMBOL(ion_import_dma_buf_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_client *client, struct ion_heap_query *query)

{

	struct ion_device *dev = client->dev;

drivers/staging/android/ion/ion_carveout_heap.c

+0 −6
Original line number Diff line number Diff line
@@ -100,10 +100,6 @@ 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);
@@ -128,8 +124,6 @@ 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

+0 −6
Original line number Diff line number Diff line
@@ -101,10 +101,6 @@ 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);
@@ -132,8 +128,6 @@ 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);