diff options
| author | Jérôme Glisse <jglisse@redhat.com> | 2019-04-09 13:49:56 -0400 |
|---|---|---|
| committer | Jérôme Glisse <jglisse@redhat.com> | 2019-04-10 11:14:19 -0400 |
| commit | 596d14fa1d6e5d56a67b6953300be0b07ebe26bc (patch) | |
| tree | b74ee50e80da5c9bced8e376f9cbf87686ca46bf | |
| parent | e9d18d89fca4979a7563834a62145212c524671b (diff) | |
mm/hmm: fix hmm_range_dma_map()/hmm_range_dma_unmap()
Was using wrong field and wrong enum for read only versus read and
write mapping.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
| -rw-r--r-- | mm/hmm.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1203,7 +1203,7 @@ long hmm_range_dma_map(struct hmm_range *range, npages = (range->end - range->start) >> PAGE_SHIFT; for (i = 0, mapped = 0; i < npages; ++i) { - enum dma_data_direction dir = DMA_FROM_DEVICE; + enum dma_data_direction dir = DMA_TO_DEVICE; struct page *page; /* @@ -1227,7 +1227,7 @@ long hmm_range_dma_map(struct hmm_range *range, } /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->values[HMM_PFN_WRITE]) + if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) dir = DMA_BIDIRECTIONAL; daddrs[i] = dma_map_page(device, page, 0, PAGE_SIZE, dir); @@ -1243,7 +1243,7 @@ long hmm_range_dma_map(struct hmm_range *range, unmap: for (npages = i, i = 0; (i < npages) && mapped; ++i) { - enum dma_data_direction dir = DMA_FROM_DEVICE; + enum dma_data_direction dir = DMA_TO_DEVICE; struct page *page; page = hmm_device_entry_to_page(range, range->pfns[i]); @@ -1254,7 +1254,7 @@ unmap: continue; /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->values[HMM_PFN_WRITE]) + if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) dir = DMA_BIDIRECTIONAL; dma_unmap_page(device, daddrs[i], PAGE_SIZE, dir); @@ -1298,7 +1298,7 @@ long hmm_range_dma_unmap(struct hmm_range *range, npages = (range->end - range->start) >> PAGE_SHIFT; for (i = 0; i < npages; ++i) { - enum dma_data_direction dir = DMA_FROM_DEVICE; + enum dma_data_direction dir = DMA_TO_DEVICE; struct page *page; page = hmm_device_entry_to_page(range, range->pfns[i]); @@ -1306,7 +1306,7 @@ long hmm_range_dma_unmap(struct hmm_range *range, continue; /* If it is read and write than map bi-directional. */ - if (range->pfns[i] & range->values[HMM_PFN_WRITE]) { + if (range->pfns[i] & range->flags[HMM_PFN_WRITE]) { dir = DMA_BIDIRECTIONAL; /* |