Commit c7345159 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct: avoid a forward declaration for phys_to_dma 



Move dma_capable down a bit so that we don't need a forward declaration
for phys_to_dma.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
parent 130c1ccb

include/linux/dma-direct.h

+14 −16
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#include <linux/memblock.h> /* for min_low_pfn */

#include <linux/mem_encrypt.h>



static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);



#ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA

#include <asm/dma-direct.h>

#else
@@ -26,20 +24,6 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr) 
}

#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	dma_addr_t end = addr + size - 1;



	if (!dev->dma_mask)

		return false;



	if (!IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&

	    min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))

		return false;



	return end <= min_not_zero(*dev->dma_mask, dev->bus_dma_mask);

}



#ifdef CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED

bool force_dma_unencrypted(struct device *dev);

#else
@@ -65,6 +49,20 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr) 
	return __sme_clr(__dma_to_phys(dev, daddr));

}



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	dma_addr_t end = addr + size - 1;



	if (!dev->dma_mask)

		return false;



	if (!IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) &&

	    min(addr, end) < phys_to_dma(dev, PFN_PHYS(min_low_pfn)))

		return false;



	return end <= min_not_zero(*dev->dma_mask, dev->bus_dma_mask);

}



u64 dma_direct_get_required_mask(struct device *dev);

void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp, unsigned long attrs);