Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757770AbaJ3Jsa (ORCPT ); Thu, 30 Oct 2014 05:48:30 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:62354 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750767AbaJ3Js2 (ORCPT ); Thu, 30 Oct 2014 05:48:28 -0400 Message-ID: <54520969.8030900@imgtec.com> Date: Thu, 30 Oct 2014 09:48:25 +0000 From: Markos Chandras User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Leonid Yegoshin , , , , , , , , , Subject: Re: [PATCH] MIPS: DMA: fix coherent alloc in non-coherent systems References: <20141030014753.13189.48344.stgit@linux-yegoshin> In-Reply-To: <20141030014753.13189.48344.stgit@linux-yegoshin> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.154.149] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 10/30/2014 01:48 AM, Leonid Yegoshin wrote: > A default dma_alloc_coherent() fails to alloc a coherent memory on non-coherent > systems in case of device->coherent_dma_mask covering the whole memory space. > > In case of non-coherent systems the coherent memory on MIPS is restricted by > size of un-cachable segment and should be located in ZONE_DMA. > > Added __GFP_DMA flag in case of non-coherent systems to enforce an allocation > of coherent memory in ZONE_DMA. > > Signed-off-by: Leonid Yegoshin > --- > .../include/asm/mach-cavium-octeon/dma-coherence.h | 2 +- > arch/mips/include/asm/mach-generic/dma-coherence.h | 2 +- > arch/mips/include/asm/mach-ip27/dma-coherence.h | 2 +- > arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +- > arch/mips/include/asm/mach-jazz/dma-coherence.h | 2 +- > .../mips/include/asm/mach-loongson/dma-coherence.h | 2 +- > arch/mips/mm/dma-default.c | 11 ++++++++--- > 7 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > index f9f4486..fe0b465 100644 > --- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > +++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h > @@ -52,7 +52,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > return 0; > } > > -static inline int plat_device_is_coherent(struct device *dev) > +static inline int plat_device_is_coherent(const struct device *dev) Why adding const here? > { > return 1; > } > diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h > index b4563df..2283996 100644 > --- a/arch/mips/include/asm/mach-generic/dma-coherence.h > +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h > @@ -47,7 +47,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > return 1; > } > > -static inline int plat_device_is_coherent(struct device *dev) > +static inline int plat_device_is_coherent(const struct device *dev) likewise > { > #ifdef CONFIG_DMA_COHERENT > return 1; > diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h > index 4ffddfd..c7767e3 100644 > --- a/arch/mips/include/asm/mach-ip27/dma-coherence.h > +++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h > @@ -58,7 +58,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > return 1; > } > > -static inline int plat_device_is_coherent(struct device *dev) > +static inline int plat_device_is_coherent(const struct device *dev) likewise > { > return 1; /* IP27 non-cohernet mode is unsupported */ > } > diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h > index 104cfbc..a6b6a55 100644 > --- a/arch/mips/include/asm/mach-ip32/dma-coherence.h > +++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h > @@ -80,7 +80,7 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) > return 1; > } > > -static inline int plat_device_is_coherent(struct device *dev) > +static inline int plat_device_is_coherent(const struct device *dev) likewise etc Is it just a matter of consistence with the rest of the interfaces? Do you need to move these into a separate patch since they don't quite fit here. -- markos -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/