From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764AbcAETC4 (ORCPT ); Tue, 5 Jan 2016 14:02:56 -0500 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35407 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbcAETCq convert rfc822-to-8bit (ORCPT ); Tue, 5 Jan 2016 14:02:46 -0500 From: Michal Nazarewicz To: Brian Starkey , gregkh@linuxfoundation.org Cc: catalin.marinas@arm.com, dan.j.williams@intel.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH 2/3] drivers: dma-coherent: use MEMREMAP_WC for DMA_MEMORY_MAP In-Reply-To: Organization: http://mina86.com/ References: User-Agent: Notmuch/0.19+53~g2e63a09 (http://notmuchmail.org) Emacs/25.1.50.1 (x86_64-unknown-linux-gnu) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACP0lEQVQ4T23Sv2vbQBQHcBk1xE6WyALX107VUEgmn6+ouUwpEQQ6uRjttkWP4CkBg2M0BQLBdPFZYPsyFYo7qEtKDQ7on+t7+nF2Ux8ahD587717OmNYrOvycHsZ+o2r051wHTHysAvGb8ygvgu4QWT0sCmkgZCIEnlV2X8BtyraazFGDuxhmKSQJMlwHQ7v5MHSNxmz78rfElwAa3ieVD9e+hBhjaPDDG6NgFo2f4wBMNIo5YmRtF0RyDgFjJjlMIWbnuM4x9MMfABGTlN4qgIQB4A1DEyA1BHWtfeWNUMwiVJKoqh97KrkOO+qzgluVYLvFCUKAX73nONeBr7BGMdM6Sg0kuep03VywLaIzRiVr+GAzKlpQIsAFnWAG2e6DT5WmWDiudZMIc6hYrMOmeMQK9WX0B+/RfjzL9DI7Y9/Iayn29Ci0r2i4f9gMimMSZLCDMalgQGU5hnUtqAN0OGvEmO1Wnl0C0wWSCEHnuHBqmygxdxA8oWXwbipoc1EoNR9DqOpBpOJrnr0criQab9ZT4LL+wI+K7GBQH30CrhUruilgP9DRTrhVWZCiAyILP+wiuLeCKGTD6r/nc8LOJcAwR6IBTUs+7CASw3QFZ0MdA2PI3zNziH4ZKVhXCRMBjeZ1DWMekKwDCASwExy+NQ86TaykaDAFHO4aP48y4fIcDM5yOG8GcTLbOyp8A8azjJI93JFd1EA6yN8sSxMQJWoABqniRZVykYgRXErzrdqExAoUrRb0xfRp8p2A/4XmfilTtkDZ4cAAAAASUVORK5CYII= X-Face: -TR8(rDTHy/(xl?SfWd1|3:TTgDIatE^t'vop%*gVg[kn$t{EpK(P"VQ=~T2#ysNmJKN$"yTRLB4YQs$4{[.]Fc1)*O]3+XO^oXM>Q#b^ix,O)Zbn)q[y06$`e3?C)`CwR9y5riE=fv^X@x$y?D:XO6L&x4f-}}I4=VRNwiA^t1-ZrVK^07.Pi/57c_du'& X-PGP: 50751FF4 X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 X-Hashcash: 1:20:160105:brian.starkey@arm.com::q1RsZsN90vGIHiO4:00000000000000000000000000000000000000000dMh X-Hashcash: 1:20:160105:catalin.marinas@arm.com::A+B3wKNBmwZV5pPK:000000000000000000000000000000000000002vcu X-Hashcash: 1:20:160105:linux-arm-kernel@lists.infradead.org::GDDaaUbiN0txTUOJ:00000000000000000000000005L1t X-Hashcash: 1:20:160105:gregkh@linuxfoundation.org::F2H8dJQx3TvvA67J:000000000000000000000000000000000004jSf X-Hashcash: 1:20:160105:dan.j.williams@intel.com::bn6PjdxDG+3IOJ0l:0000000000000000000000000000000000000Aruq X-Hashcash: 1:20:160105:linux-kernel@vger.kernel.org::U8SdXU5yA9mA7WDe:000000000000000000000000000000000DXpK Date: Tue, 05 Jan 2016 20:02:41 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jan 05 2016, Brian Starkey wrote: > When the DMA_MEMORY_MAP flag is used, memory which can be accessed > directly should be returned, so use memremap(..., MEMREMAP_WC) to > provide a writecombine mapping. > > Signed-off-by: Brian Starkey > Reviewed-by: Catalin Marinas Acked-by: Michal Nazarewicz > --- > drivers/base/dma-coherent.c | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c > index 55b8398..f98359a 100644 > --- a/drivers/base/dma-coherent.c > +++ b/drivers/base/dma-coherent.c > @@ -2,6 +2,7 @@ > * Coherent per-device memory handling. > * Borrowed from i386 > */ > +#include > #include > #include > #include > @@ -31,7 +32,10 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, dma_addr_t device_add > if (!size) > goto out; > > - mem_base = ioremap(phys_addr, size); > + if (flags & DMA_MEMORY_MAP) > + mem_base = memremap(phys_addr, size, MEMREMAP_WC); > + else > + mem_base = ioremap(phys_addr, size); > if (!mem_base) > goto out; > > @@ -58,8 +62,12 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, dma_addr_t device_add > > out: > kfree(dma_mem); > - if (mem_base) > - iounmap(mem_base); > + if (mem_base) { > + if (flags & DMA_MEMORY_MAP) > + memunmap(mem_base); > + else > + iounmap(mem_base); > + } > return 0; > } > > @@ -67,7 +75,11 @@ static void dma_release_coherent_memory(struct dma_coherent_mem *mem) > { > if (!mem) > return; > - iounmap(mem->virt_base); > + > + if (mem->flags & DMA_MEMORY_MAP) > + memunmap(mem->virt_base); > + else > + iounmap(mem->virt_base); > kfree(mem->bitmap); > kfree(mem); > } > -- > 1.7.9.5 > -- Best regards, _ _ .o. | Liege of Serenely Enlightened Majesty of o' \,=./ `o ..o | Computer Science, ミハウ “mina86” ナザレヴイツ (o o) ooo +------ooO--(_)--Ooo--