|
@@ -144,15 +144,14 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
|
|
|
unsigned long base;
|
|
|
unsigned long boundary_size;
|
|
|
|
|
|
- BUG_ON(arena->dma_base & ~PAGE_MASK);
|
|
|
base = arena->dma_base >> PAGE_SHIFT;
|
|
|
- if (dev)
|
|
|
- boundary_size = ALIGN(dma_get_max_seg_size(dev) + 1, PAGE_SIZE)
|
|
|
- >> PAGE_SHIFT;
|
|
|
- else
|
|
|
- boundary_size = ALIGN(1UL << 32, PAGE_SIZE) >> PAGE_SHIFT;
|
|
|
-
|
|
|
- BUG_ON(!is_power_of_2(boundary_size));
|
|
|
+ if (dev) {
|
|
|
+ boundary_size = dma_get_seg_boundary(dev) + 1;
|
|
|
+ BUG_ON(!is_power_of_2(boundary_size));
|
|
|
+ boundary_size >>= PAGE_SHIFT;
|
|
|
+ } else {
|
|
|
+ boundary_size = 1UL << (32 - PAGE_SHIFT);
|
|
|
+ }
|
|
|
|
|
|
/* Search forward for the first mask-aligned sequence of N free ptes */
|
|
|
ptes = arena->ptes;
|