diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-01-04 09:50:33 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-01-05 08:27:32 +0100 |
| commit | 06f55fd2d22742ed7e725124dfea68936d12ce40 (patch) | |
| tree | 5bbf65577198f5171ec2ccc890ce9f9cb5322400 /arch/x86 | |
| parent | 48e638fb68be8fecdca0611beff53a9c947704e3 (diff) | |
| download | linux-06f55fd2d22742ed7e725124dfea68936d12ce40.tar.gz linux-06f55fd2d22742ed7e725124dfea68936d12ce40.tar.bz2 linux-06f55fd2d22742ed7e725124dfea68936d12ce40.zip | |
x86/amd_gart: fix unmapping of non-GART mappings
In many cases we don't have to create a GART mapping at all, which
also means there is nothing to unmap. Fix the range check that was
incorrectly modified when removing the mapping_error method.
Fixes: 9e8aa6b546 ("x86/amd_gart: remove the mapping_error dma_map_ops method")
Reported-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Michal Kubecek <mkubecek@suse.cz>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/amd_gart_64.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c index e0ff3ac8c127..2c0aa34af69c 100644 --- a/arch/x86/kernel/amd_gart_64.c +++ b/arch/x86/kernel/amd_gart_64.c @@ -256,7 +256,15 @@ static void gart_unmap_page(struct device *dev, dma_addr_t dma_addr, int npages; int i; - if (dma_addr == DMA_MAPPING_ERROR || + if (WARN_ON_ONCE(dma_addr == DMA_MAPPING_ERROR)) + return; + + /* + * This driver will not always use a GART mapping, but might have + * created a direct mapping instead. If that is the case there is + * nothing to unmap here. + */ + if (dma_addr < iommu_bus_base || dma_addr >= iommu_bus_base + iommu_size) return; |