diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-19 10:23:15 +0200 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-28 18:15:57 +0200 |
| commit | 11b83888ae729457b5cfb936dbd498481f6408df (patch) | |
| tree | c36205ce5df9ea1ff06fe6f70670ff6dd4cf81d3 /arch/x86/kernel/amd_iommu.c | |
| parent | 00cd122ae5e5e7c60cce2af3c35b190d4c3f2d0d (diff) | |
| download | linux-11b83888ae729457b5cfb936dbd498481f6408df.tar.gz linux-11b83888ae729457b5cfb936dbd498481f6408df.tar.bz2 linux-11b83888ae729457b5cfb936dbd498481f6408df.zip | |
amd-iommu: enlarge the aperture dynamically
By dynamically increasing the aperture the extended allocator is now
ready for use.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
| -rw-r--r-- | arch/x86/kernel/amd_iommu.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 59ee1b94a7ce..d129d8feba07 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -1403,10 +1403,26 @@ static dma_addr_t __map_single(struct device *dev, if (align) align_mask = (1UL << get_order(size)) - 1; +retry: address = dma_ops_alloc_addresses(dev, dma_dom, pages, align_mask, dma_mask); - if (unlikely(address == bad_dma_address)) - goto out; + if (unlikely(address == bad_dma_address)) { + /* + * setting next_address here will let the address + * allocator only scan the new allocated range in the + * first run. This is a small optimization. + */ + dma_dom->next_address = dma_dom->aperture_size; + + if (alloc_new_range(iommu, dma_dom, false, GFP_ATOMIC)) + goto out; + + /* + * aperture was sucessfully enlarged by 128 MB, try + * allocation again + */ + goto retry; + } start = address; for (i = 0; i < pages; ++i) { |