diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2008-09-08 05:10:13 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-08 09:50:07 -0400 |
commit | 823e7e8c6ef12cd1943dc42fe7595ca74e8cc3d7 (patch) | |
tree | 56f4b01741353ad4d24f24adeeedd68eaa041354 /arch | |
parent | 8a53ad675f86ee003482b557da944e070d3c4859 (diff) |
x86: dma_alloc_coherent sets gfp flags properly
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/pci-nommu.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c index ada1c87cafc2..8e398b56f50b 100644 --- a/arch/x86/kernel/pci-nommu.c +++ b/arch/x86/kernel/pci-nommu.c | |||
@@ -80,26 +80,11 @@ nommu_alloc_coherent(struct device *hwdev, size_t size, | |||
80 | int node; | 80 | int node; |
81 | struct page *page; | 81 | struct page *page; |
82 | 82 | ||
83 | gfp |= __GFP_ZERO; | 83 | dma_mask = dma_alloc_coherent_mask(hwdev, gfp); |
84 | |||
85 | dma_mask = hwdev->coherent_dma_mask; | ||
86 | if (!dma_mask) | ||
87 | dma_mask = *(hwdev->dma_mask); | ||
88 | 84 | ||
89 | if (dma_mask < DMA_24BIT_MASK) | 85 | gfp |= __GFP_ZERO; |
90 | return NULL; | ||
91 | 86 | ||
92 | node = dev_to_node(hwdev); | 87 | node = dev_to_node(hwdev); |
93 | |||
94 | #ifdef CONFIG_X86_64 | ||
95 | if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA)) | ||
96 | gfp |= GFP_DMA32; | ||
97 | #endif | ||
98 | |||
99 | /* No alloc-free penalty for ISA devices */ | ||
100 | if (dma_mask == DMA_24BIT_MASK) | ||
101 | gfp |= GFP_DMA; | ||
102 | |||
103 | again: | 88 | again: |
104 | page = alloc_pages_node(node, gfp, get_order(size)); | 89 | page = alloc_pages_node(node, gfp, get_order(size)); |
105 | if (!page) | 90 | if (!page) |