From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756531AbbA1UWu (ORCPT ); Wed, 28 Jan 2015 15:22:50 -0500 Received: from service88.mimecast.com ([195.130.217.12]:37088 "EHLO service88.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756457AbbA1UWp convert rfc822-to-8bit (ORCPT ); Wed, 28 Jan 2015 15:22:45 -0500 Message-ID: <54C8C652.8050507@arm.com> Date: Wed, 28 Jan 2015 11:21:54 +0000 From: Robin Murphy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Murali Karicheri , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" CC: Russell King , Arnd Bergmann , Will Deacon , Rob Herring , Bjorn Helgaas , "grant.likely@linaro.org" Subject: Re: [PATCH v5 3/8] of: fix size when dma-range is not used References: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com> <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> In-Reply-To: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> X-OriginalArrivalTime: 28 Jan 2015 11:21:54.0851 (UTC) FILETIME=[9F078F30:01D03AEC] X-MC-Unique: 115012811215711801 Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Murali, [sorry, missed replying to yesterday's version] On 27/01/15 21:00, Murali Karicheri wrote: > Fix the dma-range size when the DT attribute is missing. i.e set size to > dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. Also add > code to check invalid values of size configured in DT and log error. > > Cc: Joerg Roedel > Cc: Grant Likely > Cc: Rob Herring > Cc: Bjorn Helgaas > Cc: Will Deacon > Cc: Russell King > Cc: Arnd Bergmann > Cc: Suravee Suthikulpanit > > Signed-off-by: Murali Karicheri > --- > drivers/of/device.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..17504f4 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +105,19 @@ void of_dma_configure(struct device *dev, struct device_node *np) > ret = of_dma_get_range(np, &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); > } > > + if (is_power_of_2(size + 1)) > + size = size + 1; > + else if (!is_power_of_2(size)) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + Couldn't these checks go into the "else" path above? We don't need to check the non-DT case, because we know we've just set it to something sensible. Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH v5 3/8] of: fix size when dma-range is not used Date: Wed, 28 Jan 2015 11:21:54 +0000 Message-ID: <54C8C652.8050507@arm.com> References: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com> <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1422392405-32196-4-git-send-email-m-karicheri2-l0cyMroinI0@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: Murali Karicheri , "linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org" , "devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , "linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" Cc: Russell King , Arnd Bergmann , Will Deacon , "grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org" , Rob Herring , Bjorn Helgaas List-Id: devicetree@vger.kernel.org Hi Murali, [sorry, missed replying to yesterday's version] On 27/01/15 21:00, Murali Karicheri wrote: > Fix the dma-range size when the DT attribute is missing. i.e set size to > dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. Also add > code to check invalid values of size configured in DT and log error. > > Cc: Joerg Roedel > Cc: Grant Likely > Cc: Rob Herring > Cc: Bjorn Helgaas > Cc: Will Deacon > Cc: Russell King > Cc: Arnd Bergmann > Cc: Suravee Suthikulpanit > > Signed-off-by: Murali Karicheri > --- > drivers/of/device.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..17504f4 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +105,19 @@ void of_dma_configure(struct device *dev, struct device_node *np) > ret = of_dma_get_range(np, &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); > } > > + if (is_power_of_2(size + 1)) > + size = size + 1; > + else if (!is_power_of_2(size)) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + Couldn't these checks go into the "else" path above? We don't need to check the non-DT case, because we know we've just set it to something sensible. Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from service88.mimecast.com ([195.130.217.12]:37087 "EHLO service88.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756451AbbA1UWp convert rfc822-to-8bit (ORCPT ); Wed, 28 Jan 2015 15:22:45 -0500 Message-ID: <54C8C652.8050507@arm.com> Date: Wed, 28 Jan 2015 11:21:54 +0000 From: Robin Murphy MIME-Version: 1.0 To: Murali Karicheri , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "iommu@lists.linux-foundation.org" , "devicetree@vger.kernel.org" , "linux-pci@vger.kernel.org" CC: Russell King , Arnd Bergmann , Will Deacon , Rob Herring , Bjorn Helgaas , "grant.likely@linaro.org" Subject: Re: [PATCH v5 3/8] of: fix size when dma-range is not used References: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com> <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> In-Reply-To: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> Content-Type: text/plain; charset=WINDOWS-1252; format=flowed Sender: linux-pci-owner@vger.kernel.org List-ID: Hi Murali, [sorry, missed replying to yesterday's version] On 27/01/15 21:00, Murali Karicheri wrote: > Fix the dma-range size when the DT attribute is missing. i.e set size to > dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. Also add > code to check invalid values of size configured in DT and log error. > > Cc: Joerg Roedel > Cc: Grant Likely > Cc: Rob Herring > Cc: Bjorn Helgaas > Cc: Will Deacon > Cc: Russell King > Cc: Arnd Bergmann > Cc: Suravee Suthikulpanit > > Signed-off-by: Murali Karicheri > --- > drivers/of/device.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..17504f4 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +105,19 @@ void of_dma_configure(struct device *dev, struct device_node *np) > ret = of_dma_get_range(np, &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); > } > > + if (is_power_of_2(size + 1)) > + size = size + 1; > + else if (!is_power_of_2(size)) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + Couldn't these checks go into the "else" path above? We don't need to check the non-DT case, because we know we've just set it to something sensible. Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: robin.murphy@arm.com (Robin Murphy) Date: Wed, 28 Jan 2015 11:21:54 +0000 Subject: [PATCH v5 3/8] of: fix size when dma-range is not used In-Reply-To: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> References: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com> <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> Message-ID: <54C8C652.8050507@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Murali, [sorry, missed replying to yesterday's version] On 27/01/15 21:00, Murali Karicheri wrote: > Fix the dma-range size when the DT attribute is missing. i.e set size to > dev->coherent_dma_mask + 1 instead of dev->coherent_dma_mask. Also add > code to check invalid values of size configured in DT and log error. > > Cc: Joerg Roedel > Cc: Grant Likely > Cc: Rob Herring > Cc: Bjorn Helgaas > Cc: Will Deacon > Cc: Russell King > Cc: Arnd Bergmann > Cc: Suravee Suthikulpanit > > Signed-off-by: Murali Karicheri > --- > drivers/of/device.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..17504f4 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +105,19 @@ void of_dma_configure(struct device *dev, struct device_node *np) > ret = of_dma_get_range(np, &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); > } > > + if (is_power_of_2(size + 1)) > + size = size + 1; > + else if (!is_power_of_2(size)) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + Couldn't these checks go into the "else" path above? We don't need to check the non-DT case, because we know we've just set it to something sensible. Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); >