Skip to content

Commit

Permalink
AMD IOMMU: avoid unnecessary low zone allocation in alloc_coherent
Browse files Browse the repository at this point in the history
x86's common alloc_coherent (dma_alloc_coherent in dma-mapping.h) sets
up the gfp flag according to the device dma_mask but AMD IOMMU doesn't
need it for devices that the IOMMU can do virtual mappings for. This
patch avoids unnecessary low zone allocation.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
FUJITA Tomonori authored and Ingo Molnar committed Sep 19, 2008
1 parent 38ddf41 commit 13d9fea
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/x86/kernel/amd_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1173,15 +1173,16 @@ static void *alloc_coherent(struct device *dev, size_t size,
if (!check_device(dev))
return NULL;

if (!get_device_resources(dev, &iommu, &domain, &devid))
flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);

virt_addr = (void *)__get_free_pages(flag, get_order(size));
if (!virt_addr)
return 0;

memset(virt_addr, 0, size);
paddr = virt_to_phys(virt_addr);

get_device_resources(dev, &iommu, &domain, &devid);

if (!iommu || !domain) {
*dma_addr = (dma_addr_t)paddr;
return virt_addr;
Expand Down

0 comments on commit 13d9fea

Please sign in to comment.