aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/amd_iommu.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index a34d8e915e3a..e4866660463e 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1173,6 +1173,9 @@ static void *alloc_coherent(struct device *dev, size_t size,
1173 if (!check_device(dev)) 1173 if (!check_device(dev))
1174 return NULL; 1174 return NULL;
1175 1175
1176 if (!get_device_resources(dev, &iommu, &domain, &devid))
1177 flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
1178
1176 virt_addr = (void *)__get_free_pages(flag, get_order(size)); 1179 virt_addr = (void *)__get_free_pages(flag, get_order(size));
1177 if (!virt_addr) 1180 if (!virt_addr)
1178 return 0; 1181 return 0;
@@ -1180,8 +1183,6 @@ static void *alloc_coherent(struct device *dev, size_t size,
1180 memset(virt_addr, 0, size); 1183 memset(virt_addr, 0, size);
1181 paddr = virt_to_phys(virt_addr); 1184 paddr = virt_to_phys(virt_addr);
1182 1185
1183 get_device_resources(dev, &iommu, &domain, &devid);
1184
1185 if (!iommu || !domain) { 1186 if (!iommu || !domain) {
1186 *dma_addr = (dma_addr_t)paddr; 1187 *dma_addr = (dma_addr_t)paddr;
1187 return virt_addr; 1188 return virt_addr;