|
@@ -656,7 +656,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
*/
|
|
*/
|
|
phys_addr_t paddr = map_single(hwdev, 0, size, DMA_FROM_DEVICE);
|
|
phys_addr_t paddr = map_single(hwdev, 0, size, DMA_FROM_DEVICE);
|
|
if (paddr == SWIOTLB_MAP_ERROR)
|
|
if (paddr == SWIOTLB_MAP_ERROR)
|
|
- return NULL;
|
|
|
|
|
|
+ goto err_warn;
|
|
|
|
|
|
ret = phys_to_virt(paddr);
|
|
ret = phys_to_virt(paddr);
|
|
dev_addr = phys_to_dma(hwdev, paddr);
|
|
dev_addr = phys_to_dma(hwdev, paddr);
|
|
@@ -670,7 +670,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
|
|
/* DMA_TO_DEVICE to avoid memcpy in unmap_single */
|
|
swiotlb_tbl_unmap_single(hwdev, paddr,
|
|
swiotlb_tbl_unmap_single(hwdev, paddr,
|
|
size, DMA_TO_DEVICE);
|
|
size, DMA_TO_DEVICE);
|
|
- return NULL;
|
|
|
|
|
|
+ goto err_warn;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -678,6 +678,13 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
|
|
memset(ret, 0, size);
|
|
memset(ret, 0, size);
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
|
|
+
|
|
|
|
+err_warn:
|
|
|
|
+ pr_warn("swiotlb: coherent allocation failed for device %s size=%zu\n",
|
|
|
|
+ dev_name(hwdev), size);
|
|
|
|
+ dump_stack();
|
|
|
|
+
|
|
|
|
+ return NULL;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(swiotlb_alloc_coherent);
|
|
EXPORT_SYMBOL(swiotlb_alloc_coherent);
|
|
|
|
|