Merge tag 'staging-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / android / ion / ion_heap.c

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index 563b84c..ea7e0a2 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -20,8 +20,7 @@
 void *ion_heap_map_kernel(struct ion_heap *heap,
                          struct ion_buffer *buffer)
 {
-       struct scatterlist *sg;
-       int i, j;
+       struct sg_page_iter piter;
        void *vaddr;
        pgprot_t pgprot;
        struct sg_table *table = buffer->sg_table;
@@ -38,14 +37,11 @@ void *ion_heap_map_kernel(struct ion_heap *heap,
        else
                pgprot = pgprot_writecombine(PAGE_KERNEL);
 
-       for_each_sg(table->sgl, sg, table->nents, i) {
-               int npages_this_entry = PAGE_ALIGN(sg->length) / PAGE_SIZE;
-               struct page *page = sg_page(sg);
-
-               BUG_ON(i >= npages);
-               for (j = 0; j < npages_this_entry; j++)
-                       *(tmp++) = page++;
+       for_each_sgtable_page(table, &piter, 0) {
+               BUG_ON(tmp - pages >= npages);
+               *tmp++ = sg_page_iter_page(&piter);
        }
+
        vaddr = vmap(pages, npages, VM_MAP, pgprot);
        vfree(pages);
 
@@ -64,32 +60,19 @@ void ion_heap_unmap_kernel(struct ion_heap *heap,
 int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
                      struct vm_area_struct *vma)
 {
+       struct sg_page_iter piter;
        struct sg_table *table = buffer->sg_table;
        unsigned long addr = vma->vm_start;
-       unsigned long offset = vma->vm_pgoff * PAGE_SIZE;
-       struct scatterlist *sg;
-       int i;
        int ret;
 
-       for_each_sg(table->sgl, sg, table->nents, i) {
-               struct page *page = sg_page(sg);
-               unsigned long remainder = vma->vm_end - addr;
-               unsigned long len = sg->length;
+       for_each_sgtable_page(table, &piter, vma->vm_pgoff) {
+               struct page *page = sg_page_iter_page(&piter);
 
-               if (offset >= sg->length) {
-                       offset -= sg->length;
-                       continue;
-               } else if (offset) {
-                       page += offset / PAGE_SIZE;
-                       len = sg->length - offset;
-                       offset = 0;
-               }
-               len = min(len, remainder);
-               ret = remap_pfn_range(vma, addr, page_to_pfn(page), len,
+               ret = remap_pfn_range(vma, addr, page_to_pfn(page), PAGE_SIZE,
                                      vma->vm_page_prot);
                if (ret)
                        return ret;
-               addr += len;
+               addr += PAGE_SIZE;
                if (addr >= vma->vm_end)
                        return 0;
        }
@@ -109,15 +92,14 @@ static int ion_heap_clear_pages(struct page **pages, int num, pgprot_t pgprot)
        return 0;
 }
 
-static int ion_heap_sglist_zero(struct scatterlist *sgl, unsigned int nents,
-                               pgprot_t pgprot)
+static int ion_heap_sglist_zero(struct sg_table *sgt, pgprot_t pgprot)
 {
        int p = 0;
        int ret = 0;
        struct sg_page_iter piter;
        struct page *pages[32];
 
-       for_each_sg_page(sgl, &piter, nents, 0) {
+       for_each_sgtable_page(sgt, &piter, 0) {
                pages[p++] = sg_page_iter_page(&piter);
                if (p == ARRAY_SIZE(pages)) {
                        ret = ion_heap_clear_pages(pages, p, pgprot);
@@ -142,16 +124,7 @@ int ion_heap_buffer_zero(struct ion_buffer *buffer)
        else
                pgprot = pgprot_writecombine(PAGE_KERNEL);
 
-       return ion_heap_sglist_zero(table->sgl, table->nents, pgprot);
-}
-
-int ion_heap_pages_zero(struct page *page, size_t size, pgprot_t pgprot)
-{
-       struct scatterlist sg;
-
-       sg_init_table(&sg, 1);
-       sg_set_page(&sg, page, size, 0);
-       return ion_heap_sglist_zero(&sg, 1, pgprot);
+       return ion_heap_sglist_zero(table, pgprot);
 }
 
 void ion_heap_freelist_add(struct ion_heap *heap, struct ion_buffer *buffer)