diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-08-14 12:26:24 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-08-14 16:27:00 +0200 |
| commit | 9420139f516d7fbc248ce17f35275cb005ed98ea (patch) | |
| tree | 4131b1f91327535de62d8fedf9cb3ef09adcc9ce /include/linux/dma-direct.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-9420139f516d7fbc248ce17f35275cb005ed98ea.tar.xz linux-dev-9420139f516d7fbc248ce17f35275cb005ed98ea.zip | |
dma-pool: fix coherent pool allocations for IOMMU mappings
When allocating coherent pool memory for an IOMMU mapping we don't care
about the DMA mask. Move the guess for the initial GFP mask into the
dma_direct_alloc_pages and pass dma_coherent_ok as a function pointer
argument so that it doesn't get applied to the IOMMU case.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Amit Pundir <amit.pundir@linaro.org>
Diffstat (limited to 'include/linux/dma-direct.h')
| -rw-r--r-- | include/linux/dma-direct.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h index 5a3ce2a24794..6e87225600ae 100644 --- a/include/linux/dma-direct.h +++ b/include/linux/dma-direct.h @@ -73,9 +73,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size, } u64 dma_direct_get_required_mask(struct device *dev); -gfp_t dma_direct_optimal_gfp_mask(struct device *dev, u64 dma_mask, - u64 *phys_mask); -bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size); void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs); void dma_direct_free(struct device *dev, size_t size, void *cpu_addr, |