nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

iommu: remove the mapping_error dma_map_ops method

Browse source 
Return DMA_MAPPING_ERROR instead of 0 on a dma mapping failure and let
the core dma-mapping code handle the rest.

Note that the existing code used AMD_IOMMU_MAPPING_ERROR to check from
a 0 return from the IOVA allocator, which is replaced with an explicit
0 as in the implementation and other users of that interface.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2018-11-21 19:28:34 +01:00
parent 887712a0a5
commit b3aa14f022
1 changed files with 5 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/iommu/amd_iommu.c
View file

@ -55,8 +55,6 @@
#include "amd_iommu_types.h" #include "amd_iommu_types.h"
#include "irq_remapping.h" #include "irq_remapping.h"
#define AMD_IOMMU_MAPPING_ERROR 0
#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28)) #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
#define LOOP_TIMEOUT 100000 #define LOOP_TIMEOUT 100000
@ -2339,7 +2337,7 @@ static dma_addr_t __map_single(struct device *dev,
paddr &= PAGE_MASK; paddr &= PAGE_MASK;
address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask); address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
if (address == AMD_IOMMU_MAPPING_ERROR) if (!address)
goto out; goto out;
prot = dir2prot(direction); prot = dir2prot(direction);
@ -2376,7 +2374,7 @@ static dma_addr_t __map_single(struct device *dev,
dma_ops_free_iova(dma_dom, address, pages); dma_ops_free_iova(dma_dom, address, pages);
return AMD_IOMMU_MAPPING_ERROR; return DMA_MAPPING_ERROR;
} }
/* /*
@ -2427,7 +2425,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
if (PTR_ERR(domain) == -EINVAL) if (PTR_ERR(domain) == -EINVAL)
return (dma_addr_t)paddr; return (dma_addr_t)paddr;
else if (IS_ERR(domain)) else if (IS_ERR(domain))
return AMD_IOMMU_MAPPING_ERROR; return DMA_MAPPING_ERROR;
dma_mask = *dev->dma_mask; dma_mask = *dev->dma_mask;
dma_dom = to_dma_ops_domain(domain); dma_dom = to_dma_ops_domain(domain);
@ -2504,7 +2502,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
npages = sg_num_pages(dev, sglist, nelems); npages = sg_num_pages(dev, sglist, nelems);
address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask); address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
if (address == AMD_IOMMU_MAPPING_ERROR) if (address == DMA_MAPPING_ERROR)
goto out_err; goto out_err;
prot = dir2prot(direction); prot = dir2prot(direction);
@ -2627,7 +2625,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
*dma_addr = __map_single(dev, dma_dom, page_to_phys(page), *dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
size, DMA_BIDIRECTIONAL, dma_mask); size, DMA_BIDIRECTIONAL, dma_mask);
if (*dma_addr == AMD_IOMMU_MAPPING_ERROR) if (*dma_addr == DMA_MAPPING_ERROR)
goto out_free; goto out_free;
return page_address(page); return page_address(page);
@ -2678,11 +2676,6 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)
return check_device(dev); return check_device(dev);
} }
static int amd_iommu_mapping_error(struct device *dev, dma_addr_t dma_addr)
{
return dma_addr == AMD_IOMMU_MAPPING_ERROR;
}
static const struct dma_map_ops amd_iommu_dma_ops = { static const struct dma_map_ops amd_iommu_dma_ops = {
.alloc = alloc_coherent, .alloc = alloc_coherent,
.free = free_coherent, .free = free_coherent,
@ -2691,7 +2684,6 @@ static const struct dma_map_ops amd_iommu_dma_ops = {
.map_sg = map_sg, .map_sg = map_sg,
.unmap_sg = unmap_sg, .unmap_sg = unmap_sg,
.dma_supported = amd_iommu_dma_supported, .dma_supported = amd_iommu_dma_supported,
.mapping_error = amd_iommu_mapping_error,
}; };
static int init_reserved_iova_ranges(void) static int init_reserved_iova_ranges(void)