diff options
| author | Colin Cross <ccross@android.com> | 2013-09-18 12:30:20 -0500 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-11-15 16:10:14 -0800 |
| commit | 51e3580bf9da57da9c860330293b73b0dbb296e0 (patch) | |
| tree | 3c8a11e23d9cdb26f9ebdf9cc6492695c0f5ea51 /drivers/staging/android/ion/ion_page_pool.c | |
| parent | 49bdc418a3c1129d49fe92d89cf77111584fb51f (diff) | |
ion: fix dma APIs
__dma_page_cpu_to_dev is a private ARM api that is not available
on 3.10 and was never available on other architectures. We can
get the same behavior by calling dma_sync_sg_for_device with a
scatterlist containing a single page. It's still not quite a
kosher use of the dma apis, we still conflate physical addresses
with bus addresses, but it should at least compile on all
platforms, and work on any platform that doesn't have a physical
to bus address translation.
Change-Id: I8451c2dae4bf85841015c016640684ac28430a5a
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers/staging/android/ion/ion_page_pool.c')
| -rw-r--r-- | drivers/staging/android/ion/ion_page_pool.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/android/ion/ion_page_pool.c b/drivers/staging/android/ion/ion_page_pool.c index 7e00f51292e..b052ff6bf38 100644 --- a/drivers/staging/android/ion/ion_page_pool.c +++ b/drivers/staging/android/ion/ion_page_pool.c @@ -34,13 +34,8 @@ static void *ion_page_pool_alloc_pages(struct ion_page_pool *pool) if (!page) return NULL; - /* this is only being used to flush the page for dma, - this api is not really suitable for calling from a driver - but no better way to flush a page for dma exist at this time */ - arm_dma_ops.sync_single_for_device(NULL, - pfn_to_dma(NULL, page_to_pfn(page)), - PAGE_SIZE << pool->order, - DMA_BIDIRECTIONAL); + ion_pages_sync_for_device(NULL, page, PAGE_SIZE << pool->order, + DMA_BIDIRECTIONAL); return page; } |