Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11b83888 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

amd-iommu: enlarge the aperture dynamically 



By dynamically increasing the aperture the extended allocator is now
ready for use.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 00cd122a

arch/x86/kernel/amd_iommu.c

+18 −2
Original line number Original line Diff line number Diff line
@@ -1403,11 +1403,27 @@ static dma_addr_t __map_single(struct device *dev, 
	if (align)

	if (align)

		align_mask = (1UL << get_order(size)) - 1;

		align_mask = (1UL << get_order(size)) - 1;





retry:

	address = dma_ops_alloc_addresses(dev, dma_dom, pages, align_mask,

	address = dma_ops_alloc_addresses(dev, dma_dom, pages, align_mask,

					  dma_mask);

					  dma_mask);

	if (unlikely(address == bad_dma_address))

	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;

			goto out;





		/*

		 * aperture was sucessfully enlarged by 128 MB, try

		 * allocation again

		 */

		goto retry;

	}



	start = address;

	start = address;

	for (i = 0; i < pages; ++i) {

	for (i = 0; i < pages; ++i) {

		ret = dma_ops_domain_map(iommu, dma_dom, start, paddr, dir);

		ret = dma_ops_domain_map(iommu, dma_dom, start, paddr, dir);