From: Christoph Hellwig Subject: [PATCH 32/67] dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32 Date: Fri, 29 Dec 2017 09:18:36 +0100 Message-ID: <20171229081911.2802-33-hch@lst.de> References: <20171229081911.2802-1-hch@lst.de> Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=PueC7iQeB2bQtfDtw8oTIUmzv3wZ1dKWeI2kB84Y3Y0=; b=rSZN0AyCANhkknmx/Lxzky47O CULA8Z8ug64ZSEJnJ0n+Ge/zpYBZHGm8ydNTuzbxcDKkOaM/q1tIXNGiavrduBimi1It34c7tLlhg wpGjNOoHd0hnLeTgzxMzRgTUjMJi7R+p2QHVq4elrm7NUR8a2S7gT1SehHWf3Ra3sHCTQz/CAQUmx nMzTCMwPt0RS2IWGPjRmgmQu89KvgRihBRUIOyVwkbJWgZmUmRPrrSFSrJ0vN/H9GbqHx1Gi7/AHY y3Nlk4sTt4h/snqOj4eWet73uP3Sjle5tL8ezzKBh4fl24GbRhBqTY8T9cEjXdfY8i1X3ux2iClCt In-Reply-To: <20171229081911.2802-1-hch@lst.de> Sender: linux-sh-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: iommu@lists.linux-foundation.org Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, adi-buildroot-devel@lists.sourceforge.net, linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org, Michal Simek , linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, patches@groups.riscv.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, Guan Xuetao , x86@kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- lib/dma-direct.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/dma-direct.c b/lib/dma-direct.c index 7e913728e099..2e9b9494610c 100644 --- a/lib/dma-direct.c +++ b/lib/dma-direct.c @@ -12,6 +12,14 @@ #define DIRECT_MAPPING_ERROR 0 +/* + * Most architectures use ZONE_DMA for the first 16 Megabytes, but + * some use it for entirely different regions: + */ +#ifndef ARCH_ZONE_DMA_BITS +#define ARCH_ZONE_DMA_BITS 24 +#endif + static bool check_addr(struct device *dev, dma_addr_t dma_addr, size_t size, const char *caller) @@ -40,6 +48,12 @@ void *dma_direct_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, int page_order = get_order(size); struct page *page = NULL; + /* GFP_DMA32 and GFP_DMA are no ops without the corresponding zones: */ + if (dev->coherent_dma_mask < DMA_BIT_MASK(32)) + gfp |= GFP_DMA32; + else if (dev->coherent_dma_mask < DMA_BIT_MASK(ARCH_ZONE_DMA_BITS)) + gfp |= GFP_DMA; + again: /* CMA can be used only in the context which permits sleeping */ if (gfpflags_allow_blocking(gfp)) { -- 2.14.2