Skip to contentSkip to conversation

Revert "iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent"

PATCH New Joerg Roedel 1 participant 1 message Jun 2, 2015 IOMMU

lore
Share & tools
lore

Joerg Roedel

author maintainer
#0 lore raw

PATCH 1/1 Revert "iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent"

From: Joerg Roedel <[email protected]>

This reverts commit 5fc872c7323534e8f7dc21bab635e7a9b9659e07.

The DMA-API does not strictly require that the memory returned by dma_alloc_coherent is zeroed out. For that another function (dma_zalloc_coherent) should be used. But all other x86 DMA-API implementation I checked zero out the memory, so that some drivers rely on it and break when it is not.

It seems the (driver-)world is not yet ready for this change, so revert it.

---
 drivers/iommu/amd_iommu.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iommu/amd_iommu.c +1 -0
index e43d489..e1c7e9e 100644
@@ -2930,6 +2930,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
 	size	  = PAGE_ALIGN(size);
 	dma_mask  = dev->coherent_dma_mask;
 	flag     &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
+	flag     |= __GFP_ZERO;
 
 	page = alloc_pages(flag | __GFP_NOWARN,  get_order(size));
 	if (!page) {
Signature · 1 line
1.8.4.5