Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755480AbbBFOid (ORCPT ); Fri, 6 Feb 2015 09:38:33 -0500 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]:42325 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754941AbbBFOib (ORCPT ); Fri, 6 Feb 2015 09:38:31 -0500 Date: Fri, 6 Feb 2015 14:38:12 +0000 From: Catalin Marinas To: Murali Karicheri Cc: "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" , Russell King , Arnd Bergmann , Joerg Roedel , Will Deacon , Rob Herring , Bjorn Helgaas , "suravee.suthikulpanit@amd.com" , "grant.likely@linaro.org" Subject: Re: [PATCH v6 3/7] of: fix size when dma-range is not used Message-ID: <20150206143812.GB20549@localhost> References: <1423173179-10227-1-git-send-email-m-karicheri2@ti.com> <1423173179-10227-4-git-send-email-m-karicheri2@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1423173179-10227-4-git-send-email-m-karicheri2@ti.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2026 Lines: 57 On Thu, Feb 05, 2015 at 09:52:55PM +0000, 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 | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..314c8a9 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,9 +105,24 @@ 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); > + > + /* > + * Add a work around to treat the size as mask + 1 in case > + * it is defined in DT as a mask. > + */ > + if (size & 1) { > + dev_warn(dev, "Invalid size 0x%llx for dma-range\n", > + size); > + size = size + 1; > + } > + > + if (!size) { > + dev_err(dev, "Adjusted size 0x%llx invalid\n", size); > + return; > + } Would it make sense to set coherent_dma_mask to 0 here to make this more noticeable? It can be done together with the mask calculation from size. -- Catalin -- 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/