From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751432AbbCTLXN (ORCPT ); Fri, 20 Mar 2015 07:23:13 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]:33586 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940AbbCTLXL (ORCPT ); Fri, 20 Mar 2015 07:23:11 -0400 From: Grant Likely Subject: Re: [PATCH] dma-mapping: fix size when of_dma_get_range() fails To: Murali Karicheri , linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arnd@arndb.de, will.deacon@arm.com, robh+dt@kernel.org, devicetree@vger.kernel.org Cc: Murali Karicheri In-Reply-To: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> References: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> Date: Thu, 19 Mar 2015 19:25:14 +0000 Message-Id: <20150319192514.0F9C7C40B87@trevor.secretlab.ca> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 24 Dec 2014 16:56:50 -0500 , Murali Karicheri wrote: > When call to of_dma_get_range() fails, the code currently set size > to dev->coherent_dma_mask instead of dev->coherent_dma_mask + 1. Fix this > to make the code consistent with the case when size is obtained from > dma-range property. > > Signed-off-by: Murali Karicheri > Reviewed-by: Arnd Bergmann Looks okay to me. I've merged it into my tree. g. > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index a54ec10..af9aef1 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -185,7 +185,7 @@ static void of_dma_configure(struct device *dev) > ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > if (ret < 0) { > dma_addr = offset = 0; > - size = dev->coherent_dma_mask; > + size = dev->coherent_dma_mask + 1; > } else { > offset = PFN_DOWN(paddr - dma_addr); > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > -- > 1.7.9.5 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH] dma-mapping: fix size when of_dma_get_range() fails Date: Thu, 19 Mar 2015 19:25:14 +0000 Message-ID: <20150319192514.0F9C7C40B87@trevor.secretlab.ca> References: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> Return-path: In-Reply-To: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> Sender: linux-kernel-owner@vger.kernel.org To: linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, arnd@arndb.de, will.deacon@arm.com, robh+dt@kernel.org, devicetree@vger.kernel.org Cc: Murali Karicheri List-Id: devicetree@vger.kernel.org On Wed, 24 Dec 2014 16:56:50 -0500 , Murali Karicheri wrote: > When call to of_dma_get_range() fails, the code currently set size > to dev->coherent_dma_mask instead of dev->coherent_dma_mask + 1. Fix this > to make the code consistent with the case when size is obtained from > dma-range property. > > Signed-off-by: Murali Karicheri > Reviewed-by: Arnd Bergmann Looks okay to me. I've merged it into my tree. g. > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index a54ec10..af9aef1 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -185,7 +185,7 @@ static void of_dma_configure(struct device *dev) > ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > if (ret < 0) { > dma_addr = offset = 0; > - size = dev->coherent_dma_mask; > + size = dev->coherent_dma_mask + 1; > } else { > offset = PFN_DOWN(paddr - dma_addr); > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > -- > 1.7.9.5 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: grant.likely@linaro.org (Grant Likely) Date: Thu, 19 Mar 2015 19:25:14 +0000 Subject: [PATCH] dma-mapping: fix size when of_dma_get_range() fails In-Reply-To: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> References: <1419458210-4079-1-git-send-email-m-karicheri2@ti.com> Message-ID: <20150319192514.0F9C7C40B87@trevor.secretlab.ca> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, 24 Dec 2014 16:56:50 -0500 , Murali Karicheri wrote: > When call to of_dma_get_range() fails, the code currently set size > to dev->coherent_dma_mask instead of dev->coherent_dma_mask + 1. Fix this > to make the code consistent with the case when size is obtained from > dma-range property. > > Signed-off-by: Murali Karicheri > Reviewed-by: Arnd Bergmann Looks okay to me. I've merged it into my tree. g. > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index a54ec10..af9aef1 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -185,7 +185,7 @@ static void of_dma_configure(struct device *dev) > ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); > if (ret < 0) { > dma_addr = offset = 0; > - size = dev->coherent_dma_mask; > + size = dev->coherent_dma_mask + 1; > } else { > offset = PFN_DOWN(paddr - dma_addr); > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > -- > 1.7.9.5 >