aboutsummaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel2015-12-21 16:20:09 +0100
committerJoerg Roedel2015-12-28 17:18:51 +0100
commita0f51447f4accd8f0f9420d8e617dd4e371504d7 (patch)
tree93fec15facaa310a6a232027d5c58ada53b39747 /drivers/iommu
parentb57c3c802e51e83620b739759c8bba829e231b57 (diff)
iommu/amd: Add dma_ops_aperture_alloc() function
Make this a wrapper around iommu_ops_area_alloc() for now and add more logic to this function later on. Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd_iommu.c37
1 files changed, 25 insertions, 12 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 1d1ef374a5a8..be0e81aff3bc 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1518,6 +1518,28 @@ out_free:
return -ENOMEM;
}
+static dma_addr_t dma_ops_aperture_alloc(struct aperture_range *range,
+ unsigned long pages,
+ unsigned long next_bit,
+ unsigned long dma_mask,
+ unsigned long boundary_size,
+ unsigned long align_mask)
+{
+ unsigned long offset, limit, flags;
+ dma_addr_t address;
+
+ offset = range->offset >> PAGE_SHIFT;
+ limit = iommu_device_max_index(APERTURE_RANGE_PAGES, offset,
+ dma_mask >> PAGE_SHIFT);
+
+ spin_lock_irqsave(&range->bitmap_lock, flags);
+ address = iommu_area_alloc(range->bitmap, limit, next_bit, pages,
+ offset, boundary_size, align_mask);
+ spin_unlock_irqrestore(&range->bitmap_lock, flags);
+
+ return address;
+}
+
static unsigned long dma_ops_area_alloc(struct device *dev,
struct dma_ops_domain *dom,
unsigned int pages,
@@ -1530,8 +1552,6 @@ static unsigned long dma_ops_area_alloc(struct device *dev,
int i = start >> APERTURE_RANGE_SHIFT;
unsigned long boundary_size, mask;
unsigned long address = -1;
- unsigned long limit;
- unsigned long flags;
next_bit >>= PAGE_SHIFT;
@@ -1541,19 +1561,12 @@ static unsigned long dma_ops_area_alloc(struct device *dev,
1UL << (BITS_PER_LONG - PAGE_SHIFT);
for (;i < max_index; ++i) {
- unsigned long offset = dom->aperture[i]->offset >> PAGE_SHIFT;
-
if (dom->aperture[i]->offset >= dma_mask)
break;
- limit = iommu_device_max_index(APERTURE_RANGE_PAGES, offset,
- dma_mask >> PAGE_SHIFT);
-
- spin_lock_irqsave(&dom->aperture[i]->bitmap_lock, flags);
- address = iommu_area_alloc(dom->aperture[i]->bitmap,
- limit, next_bit, pages, offset,
- boundary_size, align_mask);
- spin_unlock_irqrestore(&dom->aperture[i]->bitmap_lock, flags);
+ address = dma_ops_aperture_alloc(dom->aperture[i], pages,
+ next_bit, dma_mask,
+ boundary_size, align_mask);
if (address != -1) {
address = dom->aperture[i]->offset +
(address << PAGE_SHIFT);