xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: dma_alloc_coherent sets gfp flags properly

Browse Source 
Non real IOMMU implemenations (which doesn't do virtual mappings,
e.g. swiotlb, pci-nommu, etc) need to use proper gfp flags and
dma_mask to allocate pages in their own dma_alloc_coherent()
(allocated page need to be suitable for device's coherent_dma_mask).

This patch makes dma_alloc_coherent do this job so that IOMMUs don't
need to take care of it any more.

Real IOMMU implemenataions can simply ignore the gfp flags.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
FUJITA Tomonori
2008-09-08 18:10:13 +09:00
committed by Ingo Molnar
parent 8a53ad675f
commit 823e7e8c6e
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kernel/pci-nommu.c
View File

@@ -80,26 +80,11 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
int node;
struct page *page;
dma_mask = dma_alloc_coherent_mask(hwdev, gfp);
gfp |= __GFP_ZERO;
dma_mask = hwdev->coherent_dma_mask;
if (!dma_mask)
dma_mask = *(hwdev->dma_mask);
if (dma_mask < DMA_24BIT_MASK)
return NULL;
node = dev_to_node(hwdev);
#ifdef CONFIG_X86_64
if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
gfp |= GFP_DMA32;
#endif
/* No alloc-free penalty for ISA devices */
if (dma_mask == DMA_24BIT_MASK)
gfp |= GFP_DMA;
again:
page = alloc_pages_node(node, gfp, get_order(size));
if (!page)