]> git.ipfire.org Git - people/ms/linux.git/commit
MIPS: dma-default: Fix 32-bit fall back to GFP_DMA
authorJames Hogan <james.hogan@imgtec.com>
Fri, 27 Mar 2015 08:33:43 +0000 (08:33 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Oct 2015 21:39:21 +0000 (14:39 -0700)
commitc295dbe5abe8bb7ccd08c52d6a619a9f2480c17d
tree8f7b05594baaf4b0a90dc1b5fd1a43cd56a72b16
parentf2f4f60cef89d8e4b12c1e54a326334d775b9e42
MIPS: dma-default: Fix 32-bit fall back to GFP_DMA

commit 53960059d56ecef67d4ddd546731623641a3d2d1 upstream.

If there is a DMA zone (usually 24bit = 16MB I believe), but no DMA32
zone, as is the case for some 32-bit kernels, then massage_gfp_flags()
will cause DMA memory allocated for devices with a 32..63-bit
coherent_dma_mask to fall back to using __GFP_DMA, even though there may
only be 32-bits of physical address available anyway.

Correct that case to compare against a mask the size of phys_addr_t
instead of always using a 64-bit mask.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Fixes: a2e715a86c6d ("MIPS: DMA: Fix computation of DMA flags from device's coherent_dma_mask.")
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9610/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/mips/mm/dma-default.c