From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH 05/14] x86/amd_gart: look at coherent_dma_mask instead of GFP_DMA Date: Thu, 15 Mar 2018 13:47:48 -0400 Message-ID: <20180315174747.GP13391@char.us.oracle.com> References: <20180314175213.20256-1-hch@lst.de> <20180314175213.20256-6-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20180314175213.20256-6-hch-jcswGhMUV9g@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Christoph Hellwig Cc: Tom Lendacky , x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Muli Ben-Yehuda , iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, David Woodhouse List-Id: iommu@lists.linux-foundation.org On Wed, Mar 14, 2018 at 06:52:04PM +0100, Christoph Hellwig wrote: > We want to phase out looking at the magic GFP_DMA flag in the dma mapping > routines, so switch the gart driver to use the coherent_dma_mask instead, > which is used to select the GFP_DMA flag in the caller. > Reviewed-by: Konrad Rzeszutek Wilk > Signed-off-by: Christoph Hellwig > --- > arch/x86/kernel/amd_gart_64.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c > index 52e3abcf3e70..79ac6caaaabb 100644 > --- a/arch/x86/kernel/amd_gart_64.c > +++ b/arch/x86/kernel/amd_gart_64.c > @@ -484,7 +484,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, > unsigned long align_mask; > struct page *page; > > - if (force_iommu && !(flag & GFP_DMA)) { > + if (force_iommu && dev->coherent_dma_mask > DMA_BIT_MASK(24)) { > flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); > page = alloc_pages(flag | __GFP_ZERO, get_order(size)); > if (!page) > -- > 2.14.2 >