Messages in this thread Patch in this message | | | Date | Thu, 17 Sep 2015 07:27:47 -0700 | From | tip-bot for Junichi Nomura <> | Subject | [tip:x86/urgent] x86/pci/dma: Fix gfp flags for coherent DMA memory allocation |
| |
Commit-ID: 590f07874e8e3c83729b919312c65aea2533c8cf Gitweb: http://git.kernel.org/tip/590f07874e8e3c83729b919312c65aea2533c8cf Author: Junichi Nomura <j-nomura@ce.jp.nec.com> AuthorDate: Mon, 14 Sep 2015 07:38:36 +0000 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Thu, 17 Sep 2015 16:22:11 +0200
x86/pci/dma: Fix gfp flags for coherent DMA memory allocation
Commit 6894258eda2f reversed the order of gfp_flags adjustment in dma_alloc_attrs() for x86 [arch/x86/kernel/pci-dma.c] As a result, relevant flags set by dma_alloc_coherent_gfp_flags() are just discarded and cause coherent DMA memory allocation failure on some devices.
Fixes: 6894258eda2f ("dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}") Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Tested-by: Tony Luck <tony.luck@intel.com> Acked-by: Christoph Hellwig <hch@lst.de> Link: http://lkml.kernel.org/r/20150914073834.GA13077@xzibit.linux.bs1.fc.nec.co.jp Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
--- arch/x86/kernel/pci-dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 84b8ef8..1b55de1 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -131,8 +131,8 @@ void dma_generic_free_coherent(struct device *dev, size_t size, void *vaddr, bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp) { - *gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp); *gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + *gfp = dma_alloc_coherent_gfp_flags(*dev, *gfp); if (!*dev) *dev = &x86_dma_fallback_dev;
| |