diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-02-21 15:55:43 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-03-16 10:48:09 +0100 |
| commit | fa7e2247c5729f990c7456fe09f3af99c8f2571b (patch) | |
| tree | 65aa46af4ff51a93301caca46b509c34267bfe40 /arch/nios2 | |
| parent | 3d0fc341c4bb66b2c41c0d1ec954a6d300e100b7 (diff) | |
| download | linux-fa7e2247c5729f990c7456fe09f3af99c8f2571b.tar.bz2 | |
dma-direct: make uncached_kernel_address more general
Rename the symbol to arch_dma_set_uncached, and pass a size to it as
well as allow an error return. That will allow reusing this hook for
in-place pagetable remapping.
As the in-place remap doesn't always require an explicit cache flush,
also detangle ARCH_HAS_DMA_PREP_COHERENT from ARCH_HAS_DMA_SET_UNCACHED.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/Kconfig | 3 | ||||
| -rw-r--r-- | arch/nios2/mm/dma-mapping.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index 44b5da37e8bd..2fc4ed210b5f 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -2,9 +2,10 @@ config NIOS2 def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE - select ARCH_HAS_UNCACHED_SEGMENT + select ARCH_HAS_DMA_SET_UNCACHED select ARCH_NO_SWAP select TIMER_OF select GENERIC_ATOMIC64 diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index f30f2749257c..fd887d5f3f9a 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c @@ -67,7 +67,7 @@ void arch_dma_prep_coherent(struct page *page, size_t size) flush_dcache_range(start, start + size); } -void *uncached_kernel_address(void *ptr) +void *arch_dma_set_uncached(void *ptr, size_t size) { unsigned long addr = (unsigned long)ptr; |