From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933361AbbLHKTI (ORCPT ); Tue, 8 Dec 2015 05:19:08 -0500 Received: from mailapp01.imgtec.com ([195.59.15.196]:57191 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932515AbbLHKTG (ORCPT ); Tue, 8 Dec 2015 05:19:06 -0500 From: Qais Yousef To: CC: , , , , , Qais Yousef Subject: [PATCH] MIPS: Fix DMA contiguous allocation Date: Tue, 8 Dec 2015 10:18:50 +0000 Message-ID: <1449569930-2118-1-git-send-email-qais.yousef@imgtec.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.154.94] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recent changes to how GFP_ATOMIC is defined seems to have broken the condition to use mips_alloc_from_contiguous() in mips_dma_alloc_coherent(). I couldn't bottom out the exact change but I think it's this one d0164adc89f6 (mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd) >>From what I see GFP_ATOMIC has multiple bits set and the check for !(gfp & GFP_ATOMIC) isn't enough. To verify if the flag is atomic we need to make sure that (gfp & GFP_ATOMIC) == GFP_ATOMIC to verify that all bits rquired to satisfy GFP_ATOMIC condition are set. Signed-off-by: Qais Yousef --- arch/mips/mm/dma-default.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index d8117be729a2..d6b8a1445a3a 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c @@ -145,7 +145,7 @@ static void *mips_dma_alloc_coherent(struct device *dev, size_t size, gfp = massage_gfp_flags(dev, gfp); - if (IS_ENABLED(CONFIG_DMA_CMA) && !(gfp & GFP_ATOMIC)) + if (IS_ENABLED(CONFIG_DMA_CMA) && ((gfp & GFP_ATOMIC) != GFP_ATOMIC)) page = dma_alloc_from_contiguous(dev, count, get_order(size)); if (!page) -- 2.1.0