Home » Mailing list archives » linux-kernel » 2008 » September » 8

[PATCH 3/5] x86: fix nommu_alloc_coherent allocation with NULL device argument

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: FUJITA Tomonori
Subject: [PATCH 3/5] x86: fix nommu_alloc_coherent allocation with NULL device argument
Date: Monday, September 8, 2008 - 2:10 am

We need to use __GFP_DMA for NULL device argument (fallback_dev) with
pci-nommu. It's a hack for ISA (and some old code) so we need to use
GFP_DMA.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 arch/x86/kernel/pci-nommu.c   |    3 +--
 include/asm-x86/dma-mapping.h |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 0f51883..ada1c87 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -80,7 +80,6 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
 	int node;
 	struct page *page;
 
-	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
 	gfp |= __GFP_ZERO;
 
 	dma_mask = hwdev->coherent_dma_mask;
@@ -93,7 +92,7 @@ nommu_alloc_coherent(struct device *hwdev, size_t size,
 	node = dev_to_node(hwdev);
 
 #ifdef CONFIG_X86_64
-	if (dma_mask <= DMA_32BIT_MASK)
+	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
 		gfp |= GFP_DMA32;
 #endif
 
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
index 39d3641..9d6dcf4 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/include/asm-x86/dma-mapping.h
@@ -248,6 +248,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
 	struct dma_mapping_ops *ops = get_dma_ops(dev);
 	void *memory;
 
+	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
+
 	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
 		return memory;
 
-- 
1.5.5.GIT

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/5] fix exhaustion of ZONE_DMA with swiotlb (in x8 ..., FUJITA Tomonori, (Mon Sep 8, 2:10 am)
[PATCH 1/5] ia64: dma_alloc_coherent always use GFP_DMA, FUJITA Tomonori, (Mon Sep 8, 2:10 am)
[PATCH 2/5] x86: move pci-nommu's dma_mask check to common ..., FUJITA Tomonori, (Mon Sep 8, 2:10 am)
[PATCH 3/5] x86: fix nommu_alloc_coherent allocation with ..., FUJITA Tomonori, (Mon Sep 8, 2:10 am)
[PATCH 4/5] x86: dma_alloc_coherent sets gfp flags properly, FUJITA Tomonori, (Mon Sep 8, 2:10 am)
[PATCH 5/5] swiotlb: remove GFP_DMA hack in swiotlb_alloc_ ..., FUJITA Tomonori, (Mon Sep 8, 2:10 am)
Re: [PATCH 0/5] fix exhaustion of ZONE_DMA with swiotlb (i ..., Joerg Roedel, (Mon Sep 8, 5:00 am)
Re: [PATCH 2/5] x86: move pci-nommu's dma_mask check to co ..., Joerg Roedel, (Mon Sep 8, 5:01 am)
Re: [PATCH 3/5] x86: fix nommu_alloc_coherent allocation w ..., Joerg Roedel, (Mon Sep 8, 5:01 am)
Re: [PATCH 4/5] x86: dma_alloc_coherent sets gfp flags pro ..., Joerg Roedel, (Mon Sep 8, 5:01 am)
Re: [PATCH 5/5] swiotlb: remove GFP_DMA hack in swiotlb_al ..., Joerg Roedel, (Mon Sep 8, 5:02 am)
Re: [PATCH 0/5] fix exhaustion of ZONE_DMA with swiotlb (i ..., Ingo Molnar, (Mon Sep 8, 6:52 am)
Re: [PATCH 0/5] fix exhaustion of ZONE_DMA with swiotlb (i ..., KAMEZAWA Hiroyuki, (Tue Sep 9, 3:41 am)