Check if we need to allocate uncached memory for a device given the allocation flags. Switch over the uncached segment check to this helper to deal with architectures that do not support the dma_cache_sync operation and thus should not returned cacheable memory for DMA_ATTR_NON_CONSISTENT allocations.
Unified · Split
| @@ -20,6 +20,20 @@ static inline bool dev_is_dma_coherent(struct device *dev) · 19 unmodified lines | |||
| 20 | } | 20 | } |
| 21 | #endif /* CONFIG_ARCH_HAS_DMA_COHERENCE_H */ | 21 | #endif /* CONFIG_ARCH_HAS_DMA_COHERENCE_H */ |
| 22 | 22 | ||
| 23 | /* | ||
| 24 | * Check if an allocation needs to be marked uncached to be coherent. | ||
| 25 | */ | ||
| 26 | static inline bool dma_alloc_need_uncached(struct device *dev, | ||
| 27 | unsigned long attrs) | ||
| 28 | { | ||
| 29 | if (dev_is_dma_coherent(dev)) | ||
| 30 | return false; | ||
| 31 | if (IS_ENABLED(CONFIG_DMA_NONCOHERENT_CACHE_SYNC) && | ||
| 32 | (attrs & DMA_ATTR_NON_CONSISTENT)) | ||
| 33 | return false; | ||
| 34 | return true; | ||
| 35 | } | ||
| 36 | |||
| 23 | void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, | 37 | void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, |
| 24 | gfp_t gfp, unsigned long attrs); | 38 | gfp_t gfp, unsigned long attrs); |
| 25 | void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, | 39 | void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, |
| @@ -160,7 +160,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, · 159 unmodified lines | |||
| 160 | memset(ret, 0, size); | 160 | memset(ret, 0, size); |
| 161 | 161 | ||
| 162 | if (IS_ENABLED(CONFIG_ARCH_HAS_UNCACHED_SEGMENT) && | 162 | if (IS_ENABLED(CONFIG_ARCH_HAS_UNCACHED_SEGMENT) && |
| 163 | !dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_NON_CONSISTENT)) { | 163 | dma_alloc_need_uncached(dev, attrs)) { |
| 164 | arch_dma_prep_coherent(page, size); | 164 | arch_dma_prep_coherent(page, size); |
| 165 | ret = uncached_kernel_address(ret); | 165 | ret = uncached_kernel_address(ret); |
| 166 | } | 166 | } |
| @@ -182,7 +182,7 @@ void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr, · 15 unmodified lines | |||
| 182 | set_memory_encrypted((unsigned long)cpu_addr, 1 << page_order); | 182 | set_memory_encrypted((unsigned long)cpu_addr, 1 << page_order); |
| 183 | 183 | ||
| 184 | if (IS_ENABLED(CONFIG_ARCH_HAS_UNCACHED_SEGMENT) && | 184 | if (IS_ENABLED(CONFIG_ARCH_HAS_UNCACHED_SEGMENT) && |
| 185 | !dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_NON_CONSISTENT)) | 185 | dma_alloc_need_uncached(dev, attrs)) |
| 186 | cpu_addr = cached_kernel_address(cpu_addr); | 186 | cpu_addr = cached_kernel_address(cpu_addr); |
| 187 | __dma_direct_free_pages(dev, size, virt_to_page(cpu_addr)); | 187 | __dma_direct_free_pages(dev, size, virt_to_page(cpu_addr)); |
| 188 | } | 188 | } |