diff options
| author | Vladimir Kondratiev <vladimir.kondratiev@intel.com> | 2016-07-03 10:07:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-20 18:10:54 +0200 |
| commit | cab58a50931fb4cc1633082ea09d67458c22e130 (patch) | |
| tree | de4dbf5b444c6db36aa903cea46f76287cd68cd1 /arch/arc | |
| parent | 157b342020bc42630ab4e00fe059a972e126a3ea (diff) | |
| download | lwn-cab58a50931fb4cc1633082ea09d67458c22e130.tar.gz lwn-cab58a50931fb4cc1633082ea09d67458c22e130.zip | |
ARC: dma: fix address translation in arc_dma_free
commit b4dff2874006e54b60ce4f4dbcfec9ab81c6aff4 upstream.
page should be calculated using physical address.
If platform uses non-trivial dma-to-phys memory translation,
dma_handle should be converted to physicval address before
calculation of page.
Failing to do so results in struct page * pointing to
wrong or non-existent memory.
Fixes: f2e3d55397ff ("ARC: dma: reintroduce platform specific dma<->phys")
Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/mm/dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index 73d7e4c75b7d..ab74b5d9186c 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c @@ -92,7 +92,8 @@ static void *arc_dma_alloc(struct device *dev, size_t size, static void arc_dma_free(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle, struct dma_attrs *attrs) { - struct page *page = virt_to_page(dma_handle); + phys_addr_t paddr = plat_dma_to_phys(dev, dma_handle); + struct page *page = virt_to_page(paddr); int is_non_coh = 1; is_non_coh = dma_get_attr(DMA_ATTR_NON_CONSISTENT, attrs) || |