iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: android: ion: Duplicate sg_table

Browse Source 
Ion currently returns a single sg_table on each dma_map call. This is
incorrect for later usage.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Laura Abbott 2017-04-03 11:57:47 -07:00 committed by Greg Kroah-Hartman
parent 1d9735efac
commit 17fd283f38
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/android/ion/ion.c
View File

@ -800,6 +800,32 @@ static void ion_buffer_sync_for_device(struct ion_buffer *buffer,
struct device *dev, struct device *dev,
enum dma_data_direction direction); enum dma_data_direction direction);
static struct sg_table *dup_sg_table(struct sg_table *table)
{
struct sg_table *new_table;
int ret, i;
struct scatterlist *sg, *new_sg;
new_table = kzalloc(sizeof(*new_table), GFP_KERNEL);
if (!new_table)
return ERR_PTR(-ENOMEM);
ret = sg_alloc_table(new_table, table->nents, GFP_KERNEL);
if (ret) {
kfree(new_table);
return ERR_PTR(-ENOMEM);
}
new_sg = new_table->sgl;
for_each_sg(table->sgl, sg, table->nents, i) {
memcpy(new_sg, sg, sizeof(*sg));
sg->dma_address = 0;
new_sg = sg_next(new_sg);
}
return new_table;
}
static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment, static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
@ -807,13 +833,15 @@ static struct sg_table *ion_map_dma_buf(struct dma_buf_attachment *attachment,
struct ion_buffer *buffer = dmabuf->priv; struct ion_buffer *buffer = dmabuf->priv;
ion_buffer_sync_for_device(buffer, attachment->dev, direction); ion_buffer_sync_for_device(buffer, attachment->dev, direction);
return buffer->sg_table; return dup_sg_table(buffer->sg_table);
} }
static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment, static void ion_unmap_dma_buf(struct dma_buf_attachment *attachment,
struct sg_table *table, struct sg_table *table,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
sg_free_table(table);
kfree(table);
} }
void ion_pages_sync_for_device(struct device *dev, struct page *page, void ion_pages_sync_for_device(struct device *dev, struct page *page,