Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1615493

[PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address

Show all headers | View raw

Now that we have proper caching, stop setting the DMA address manually.
It should be set after properly calling dma_map.

Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/staging/android/ion/ion.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 3d979ef5..65638f5 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -81,8 +81,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
 {
 	struct ion_buffer *buffer;
 	struct sg_table *table;
-	struct scatterlist *sg;
-	int i, ret;
+	int ret;
 
 	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
 	if (!buffer)
@@ -119,20 +118,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
 	INIT_LIST_HEAD(&buffer->vmas);
 	INIT_LIST_HEAD(&buffer->attachments);
 	mutex_init(&buffer->lock);
-	/*
-	 * this will set up dma addresses for the sglist -- it is not
-	 * technically correct as per the dma api -- a specific
-	 * device isn't really taking ownership here.  However, in practice on
-	 * our systems the only dma_address space is physical addresses.
-	 * Additionally, we can't afford the overhead of invalidating every
-	 * allocation via dma_map_sg. The implicit contract here is that
-	 * memory coming from the heaps is ready for dma, ie if it has a
-	 * cached mapping that mapping has been invalidated
-	 */
-	for_each_sg(buffer->sg_table->sgl, sg, buffer->sg_table->nents, i) {
-		sg_dma_address(sg) = sg_phys(sg);
-		sg_dma_len(sg) = sg->length;
-	}
 	mutex_lock(&dev->buffer_lock);
 	ion_buffer_add(dev, buffer);
 	mutex_unlock(&dev->buffer_lock);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv3 00/22] Ion clean up in preparation in moving out of staging Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 15/22] staging: android: ion: Break the ABI in the name of forward progress Laura Abbott <labbott@redhat.com> - 2017-04-03 21:00 +0200
  [PATCHv3 07/22] staging: android: ion: Remove page faulting support Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 19/22] staging: android: ion: Drop ion_map_kernel interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 14/22] staging: android: ion: Stop butchering the DMA address Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 18/22] staging: android: ion: Rework heap registration/enumeration Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 06/22] staging: android: ion: Call dma_map_sg for syncing and mapping Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 05/22] staging: android: ion: Duplicate sg_table Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 11/22] staging: android: ion: Remove duplicate ION_IOC_MAP Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 22/22] staging/android: Update Ion TODO list Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 04/22] staging: android: ion: Remove alignment from allocation field Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 21/22] staging: android: ion: Set query return value Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  [PATCHv3 09/22] staging: android: ion: Remove custom ioctl interface Laura Abbott <labbott@redhat.com> - 2017-04-03 21:10 +0200
  Re: [PATCHv3 00/22] Ion clean up in preparation in moving out of  staging Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2017-04-08 12:40 +0200
  Re: [PATCHv3 17/22] staging: android: ion: Collapse internal header files Emil Velikov <emil.l.velikov@gmail.com> - 2017-04-08 20:20 +0200

csiph-web