Skip to content

Commit

Permalink
iommu/amd: Introduce dir2prot() helper
Browse files Browse the repository at this point in the history
This function converts dma_data_direction to
iommu-protection flags. This will be needed on multiple
places in the code, so this will save some code.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Joerg Roedel committed Jul 13, 2016
1 parent bb27947 commit f37f7f3
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions drivers/iommu/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2252,6 +2252,17 @@ static void update_domain(struct protection_domain *domain)
domain->updated = false;
}

static int dir2prot(enum dma_data_direction direction)
{
if (direction == DMA_TO_DEVICE)
return IOMMU_PROT_IR;
else if (direction == DMA_FROM_DEVICE)
return IOMMU_PROT_IW;
else if (direction == DMA_BIDIRECTIONAL)
return IOMMU_PROT_IW | IOMMU_PROT_IR;
else
return 0;
}
/*
* This function contains common code for mapping of a physically
* contiguous memory region into DMA address space. It is used by all
Expand All @@ -2262,7 +2273,7 @@ static dma_addr_t __map_single(struct device *dev,
struct dma_ops_domain *dma_dom,
phys_addr_t paddr,
size_t size,
int direction,
enum dma_data_direction direction,
u64 dma_mask)
{
dma_addr_t offset = paddr & ~PAGE_MASK;
Expand All @@ -2278,12 +2289,7 @@ static dma_addr_t __map_single(struct device *dev,
if (address == DMA_ERROR_CODE)
goto out;

if (direction == DMA_TO_DEVICE)
prot = IOMMU_PROT_IR;
else if (direction == DMA_FROM_DEVICE)
prot = IOMMU_PROT_IW;
else if (direction == DMA_BIDIRECTIONAL)
prot = IOMMU_PROT_IW | IOMMU_PROT_IR;
prot = dir2prot(direction);

start = address;
for (i = 0; i < pages; ++i) {
Expand Down

0 comments on commit f37f7f3

Please sign in to comment.