mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
iommu/amd: implement ->mapping_error
DMA_ERROR_CODE is going to go away, so don't rely on it. Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
e830467143
commit
a869572c31
1 changed files with 13 additions and 5 deletions
|
@ -54,6 +54,8 @@
|
|||
#include "amd_iommu_types.h"
|
||||
#include "irq_remapping.h"
|
||||
|
||||
#define AMD_IOMMU_MAPPING_ERROR 0
|
||||
|
||||
#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
|
||||
|
||||
#define LOOP_TIMEOUT 100000
|
||||
|
@ -2394,7 +2396,7 @@ static dma_addr_t __map_single(struct device *dev,
|
|||
paddr &= PAGE_MASK;
|
||||
|
||||
address = dma_ops_alloc_iova(dev, dma_dom, pages, dma_mask);
|
||||
if (address == DMA_ERROR_CODE)
|
||||
if (address == AMD_IOMMU_MAPPING_ERROR)
|
||||
goto out;
|
||||
|
||||
prot = dir2prot(direction);
|
||||
|
@ -2431,7 +2433,7 @@ static dma_addr_t __map_single(struct device *dev,
|
|||
|
||||
dma_ops_free_iova(dma_dom, address, pages);
|
||||
|
||||
return DMA_ERROR_CODE;
|
||||
return AMD_IOMMU_MAPPING_ERROR;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -2483,7 +2485,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
|
|||
if (PTR_ERR(domain) == -EINVAL)
|
||||
return (dma_addr_t)paddr;
|
||||
else if (IS_ERR(domain))
|
||||
return DMA_ERROR_CODE;
|
||||
return AMD_IOMMU_MAPPING_ERROR;
|
||||
|
||||
dma_mask = *dev->dma_mask;
|
||||
dma_dom = to_dma_ops_domain(domain);
|
||||
|
@ -2560,7 +2562,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
|
|||
npages = sg_num_pages(dev, sglist, nelems);
|
||||
|
||||
address = dma_ops_alloc_iova(dev, dma_dom, npages, dma_mask);
|
||||
if (address == DMA_ERROR_CODE)
|
||||
if (address == AMD_IOMMU_MAPPING_ERROR)
|
||||
goto out_err;
|
||||
|
||||
prot = dir2prot(direction);
|
||||
|
@ -2683,7 +2685,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
|
|||
*dma_addr = __map_single(dev, dma_dom, page_to_phys(page),
|
||||
size, DMA_BIDIRECTIONAL, dma_mask);
|
||||
|
||||
if (*dma_addr == DMA_ERROR_CODE)
|
||||
if (*dma_addr == AMD_IOMMU_MAPPING_ERROR)
|
||||
goto out_free;
|
||||
|
||||
return page_address(page);
|
||||
|
@ -2732,6 +2734,11 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)
|
|||
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 = {
|
||||
.alloc = alloc_coherent,
|
||||
.free = free_coherent,
|
||||
|
@ -2740,6 +2747,7 @@ static const struct dma_map_ops amd_iommu_dma_ops = {
|
|||
.map_sg = map_sg,
|
||||
.unmap_sg = unmap_sg,
|
||||
.dma_supported = amd_iommu_dma_supported,
|
||||
.mapping_error = amd_iommu_mapping_error,
|
||||
};
|
||||
|
||||
static int init_reserved_iova_ranges(void)
|
||||
|
|
Loading…
Reference in a new issue