From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753135AbdFVM7U (ORCPT ); Thu, 22 Jun 2017 08:59:20 -0400 Received: from foss.arm.com ([217.140.101.70]:37908 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751893AbdFVM7Q (ORCPT ); Thu, 22 Jun 2017 08:59:16 -0400 Subject: Re: [PATCH v5 3/7] drivers: dma-coherent: Account dma_pfn_offset when used with device tree To: Christoph Hellwig References: <1495621472-9323-1-git-send-email-vladimir.murzin@arm.com> <1495621472-9323-4-git-send-email-vladimir.murzin@arm.com> <20170620134219.GA31496@infradead.org> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux@armlinux.org.uk, sza@esh.hu, arnd@arndb.de, gregkh@linuxfoundation.org, akpm@linux-foundation.org, alexandre.torgue@st.com, robin.murphy@arm.com, benjamin.gaignard@linaro.org, kbuild-all@01.org, Michal Nazarewicz , Marek Szyprowski , Roger Quadros From: Vladimir Murzin Message-ID: <83723f69-32a7-02ae-da5c-5856136fd805@arm.com> Date: Thu, 22 Jun 2017 13:59:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170620134219.GA31496@infradead.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/06/17 14:42, Christoph Hellwig wrote: > Wouldn't the smal patch below solve the same issue in a simple way? > > diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c > index 640a7e63c453..e8f8447d705b 100644 > --- a/drivers/base/dma-coherent.c > +++ b/drivers/base/dma-coherent.c > @@ -290,9 +290,11 @@ EXPORT_SYMBOL(dma_mmap_from_coherent); > static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev) > { > struct dma_coherent_mem *mem = rmem->priv; > + dma_addr_t dev_addr = ((rmem->base >> PAGE_SHIFT) - > + dev->dma_pfn_offset) << PAGE_SHIFT; > > if (!mem && > - !dma_init_coherent_memory(rmem->base, rmem->base, rmem->size, > + !dma_init_coherent_memory(rmem->base, dev_addr, rmem->size, > DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE, > &mem)) { > pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n", > Robin has already commented on this - dma_pfn_offset may vary across devices and reserved memory region may be shared between them. Cheers Vladimir From mboxrd@z Thu Jan 1 00:00:00 1970 From: vladimir.murzin@arm.com (Vladimir Murzin) Date: Thu, 22 Jun 2017 13:59:11 +0100 Subject: [PATCH v5 3/7] drivers: dma-coherent: Account dma_pfn_offset when used with device tree In-Reply-To: <20170620134219.GA31496@infradead.org> References: <1495621472-9323-1-git-send-email-vladimir.murzin@arm.com> <1495621472-9323-4-git-send-email-vladimir.murzin@arm.com> <20170620134219.GA31496@infradead.org> Message-ID: <83723f69-32a7-02ae-da5c-5856136fd805@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 20/06/17 14:42, Christoph Hellwig wrote: > Wouldn't the smal patch below solve the same issue in a simple way? > > diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c > index 640a7e63c453..e8f8447d705b 100644 > --- a/drivers/base/dma-coherent.c > +++ b/drivers/base/dma-coherent.c > @@ -290,9 +290,11 @@ EXPORT_SYMBOL(dma_mmap_from_coherent); > static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *dev) > { > struct dma_coherent_mem *mem = rmem->priv; > + dma_addr_t dev_addr = ((rmem->base >> PAGE_SHIFT) - > + dev->dma_pfn_offset) << PAGE_SHIFT; > > if (!mem && > - !dma_init_coherent_memory(rmem->base, rmem->base, rmem->size, > + !dma_init_coherent_memory(rmem->base, dev_addr, rmem->size, > DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE, > &mem)) { > pr_err("Reserved memory: failed to init DMA memory pool at %pa, size %ld MiB\n", > Robin has already commented on this - dma_pfn_offset may vary across devices and reserved memory region may be shared between them. Cheers Vladimir