|
@@ -1173,6 +1173,9 @@ 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;
|
|
@@ -1180,8 +1183,6 @@ static void *alloc_coherent(struct device *dev, size_t size,
|
|
|
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;
|