You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
2.1 KiB
Diff
70 lines
2.1 KiB
Diff
From a3794022e928547de664abd03b61280163c7f13a Mon Sep 17 00:00:00 2001
|
|
From: Christoph Hellwig <hch@lst.de>
|
|
Date: Tue, 12 Nov 2019 17:07:43 +0100
|
|
Subject: [PATCH] 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: Christoph Hellwig <hch@lst.de>
|
|
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
(cherry picked from commit c7345159f7db6fb69ec1c3b3f8f28cd05c731be2)
|
|
---
|
|
include/linux/dma-direct.h | 30 ++++++++++++++----------------
|
|
1 file changed, 14 insertions(+), 16 deletions(-)
|
|
|
|
--- a/include/linux/dma-direct.h
|
|
+++ b/include/linux/dma-direct.h
|
|
@@ -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);
|
|
-
|
|
extern unsigned int zone_dma_bits;
|
|
|
|
#ifdef CONFIG_ARCH_HAS_PHYS_TO_DMA
|
|
@@ -28,20 +26,6 @@ static inline phys_addr_t __dma_to_phys(
|
|
}
|
|
#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
|
|
@@ -67,6 +51,20 @@ static inline phys_addr_t dma_to_phys(st
|
|
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);
|