diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-02-14 11:44:32 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-04-18 08:21:08 +0300 |
| commit | 07410559f38360885e91cff1b800168681ac515c (patch) | |
| tree | 954ff4eb49ffee387a978e37e296d42582317547 /kernel/dma | |
| parent | b2d229d4ddb17db541098b83524d901257e93845 (diff) | |
| download | linux-07410559f38360885e91cff1b800168681ac515c.tar.xz | |
dma-direct: use is_swiotlb_active in dma_direct_map_page
Use the more specific is_swiotlb_active check instead of checking the
global swiotlb_force variable.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'kernel/dma')
| -rw-r--r-- | kernel/dma/direct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/dma/direct.h b/kernel/dma/direct.h index 8a6cd53dbe8c..a78c0ba70645 100644 --- a/kernel/dma/direct.h +++ b/kernel/dma/direct.h @@ -91,7 +91,7 @@ static inline dma_addr_t dma_direct_map_page(struct device *dev, return swiotlb_map(dev, phys, size, dir, attrs); if (unlikely(!dma_capable(dev, dma_addr, size, true))) { - if (swiotlb_force != SWIOTLB_NO_FORCE) + if (is_swiotlb_active(dev)) return swiotlb_map(dev, phys, size, dir, attrs); dev_WARN_ONCE(dev, 1, |