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

Commit 1d804535 authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

ion: don't use phys_to_page or __phys_to_pfn 



phys_to_page and __phys_to_pfn don't exist on all platforms.
Use a combination of pfn_to_page, PFN_DOWN, page_to_pfn, and
virt_to_page to get the same results.

Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8be3759a

drivers/staging/android/ion/ion_carveout_heap.c

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap, 
		kfree(table);

		return ERR_PTR(ret);

	}

	sg_set_page(table->sgl, phys_to_page(buffer->priv_phys), buffer->size,

		    0);

	sg_set_page(table->sgl, pfn_to_page(PFN_DOWN(buffer->priv_phys)),

			buffer->size, 0);

	return table;

}

drivers/staging/android/ion/ion_chunk_heap.c

+3 −2
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap, 
						     chunk_heap->chunk_size);

		if (!paddr)

			goto err;

		sg_set_page(sg, phys_to_page(paddr), chunk_heap->chunk_size, 0);

		sg_set_page(sg, pfn_to_page(PFN_DOWN(paddr)),

				chunk_heap->chunk_size, 0);

		sg = sg_next(sg);

	}
@@ -167,7 +168,7 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) 
		goto error;

	}

	for (i = 0; i < chunk_heap->size; i += PAGE_SIZE) {

		struct page *page = phys_to_page(chunk_heap->base + i);

		struct page *page = pfn_to_page(PFN_DOWN(chunk_heap->base + i));

		struct page **pages = &page;



		ret = map_vm_area(vm_struct, pgprot, &pages);

drivers/staging/android/ion/ion_system_heap.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ int ion_system_contig_heap_map_user(struct ion_heap *heap, 
				    struct ion_buffer *buffer,

				    struct vm_area_struct *vma)

{

	unsigned long pfn = __phys_to_pfn(virt_to_phys(buffer->priv_virt));

	unsigned long pfn = page_to_pfn(virt_to_page(buffer->priv_virt));

	return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff,

			       vma->vm_end - vma->vm_start,

			       vma->vm_page_prot);