From: Robin Murphy <robin.murphy@arm.com> To: Murali Karicheri <m-karicheri2@ti.com>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>, "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>, "iommu@lists.linux-foundation.org" <iommu@lists.linux-foundation.org> Cc: Russell King <linux@arm.linux.org.uk>, Arnd Bergmann <arnd@arndb.de>, Joerg Roedel <joro@8bytes.org>, Will Deacon <Will.Deacon@arm.com>, Rob Herring <robh+dt@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, "suravee.suthikulpanit@amd.com" <suravee.suthikulpanit@amd.com>, "grant.likely@linaro.org" <grant.likely@linaro.org> Subject: Re: [PATCH v4 3/6] of: fix size when dma-range is not used Date: Tue, 27 Jan 2015 11:27:18 +0000 [thread overview] Message-ID: <54C77616.80301@arm.com> (raw) In-Reply-To: <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> Hi Murali, On 23/01/15 22:32, 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. To detect > overflow when mask is set to max of u64, add a check, log error and return. > Some platform use mask format for size in DTS. So add a work around to > catch this and fix. > > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Grant Likely <grant.likely@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> > --- > drivers/of/device.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..0a5ff54 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +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) > + size = size + 1; > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > } > > + /* if size is 0, we have an overflow of u64 */ > + if (!size) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + This seems potentially fragile to dodgy DTs given that we might also be using size to make a mask later. Would it make sense to double-up a sanity check as mask-format detection? Something like: if is_power_of_2(size) // use size else if is_power_of_2(size + 1) // use size + 1 else // cry Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); >
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/6] of: fix size when dma-range is not used Date: Tue, 27 Jan 2015 11:27:18 +0000 [thread overview] Message-ID: <54C77616.80301@arm.com> (raw) In-Reply-To: <1422052359-12384-4-git-send-email-m-karicheri2@ti.com> Hi Murali, On 23/01/15 22:32, 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. To detect > overflow when mask is set to max of u64, add a check, log error and return. > Some platform use mask format for size in DTS. So add a work around to > catch this and fix. > > Cc: Joerg Roedel <joro@8bytes.org> > Cc: Grant Likely <grant.likely@linaro.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Bjorn Helgaas <bhelgaas@google.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Russell King <linux@arm.linux.org.uk> > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> > > Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> > --- > drivers/of/device.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 2de320d..0a5ff54 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -105,12 +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) > + size = size + 1; > dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset); > } > > + /* if size is 0, we have an overflow of u64 */ > + if (!size) { > + dev_err(dev, "invalid size\n"); > + return; > + } > + This seems potentially fragile to dodgy DTs given that we might also be using size to make a mask later. Would it make sense to double-up a sanity check as mask-format detection? Something like: if is_power_of_2(size) // use size else if is_power_of_2(size + 1) // use size + 1 else // cry Robin. > dev->dma_pfn_offset = offset; > > coherent = of_dma_is_coherent(np); >
next prev parent reply other threads:[~2015-01-27 11:27 UTC|newest] Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-23 22:32 [PATCH v4 0/6] PCI: get DMA configuration from parent device Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` [PATCH v4 1/6] of: iommu: add ptr to OF node arg to of_iommu_configure() Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-25 13:32 ` Laurent Pinchart 2015-01-25 13:32 ` Laurent Pinchart 2015-01-25 13:32 ` Laurent Pinchart 2015-01-26 18:49 ` Murali Karicheri 2015-01-26 18:49 ` Murali Karicheri 2015-01-26 18:49 ` Murali Karicheri 2015-01-28 11:33 ` Will Deacon 2015-01-28 11:33 ` Will Deacon 2015-01-28 11:33 ` Will Deacon 2015-01-28 11:33 ` Will Deacon 2015-01-28 12:23 ` Laurent Pinchart 2015-01-28 12:23 ` Laurent Pinchart 2015-01-28 12:23 ` Laurent Pinchart 2015-01-28 12:23 ` Laurent Pinchart 2015-01-28 12:29 ` Will Deacon 2015-01-28 12:29 ` Will Deacon 2015-01-28 12:29 ` Will Deacon 2015-01-28 12:29 ` Will Deacon 2015-01-28 13:15 ` Laurent Pinchart 2015-01-28 13:15 ` Laurent Pinchart 2015-01-28 13:15 ` Laurent Pinchart 2015-01-28 13:15 ` Laurent Pinchart 2015-01-28 13:32 ` Will Deacon 2015-01-28 13:32 ` Will Deacon 2015-01-28 13:32 ` Will Deacon 2015-01-28 13:32 ` Will Deacon 2015-01-28 15:21 ` Murali Karicheri 2015-01-28 15:21 ` Murali Karicheri 2015-01-28 15:21 ` Murali Karicheri 2015-01-28 15:21 ` Murali Karicheri 2015-01-28 23:32 ` Laurent Pinchart 2015-01-28 23:32 ` Laurent Pinchart 2015-01-28 23:32 ` Laurent Pinchart 2015-01-28 23:32 ` Laurent Pinchart 2015-01-29 14:59 ` Murali Karicheri 2015-01-29 14:59 ` Murali Karicheri 2015-01-29 14:59 ` Murali Karicheri 2015-01-29 14:59 ` Murali Karicheri 2015-01-29 16:49 ` Rob Herring 2015-01-29 16:49 ` Rob Herring 2015-01-29 16:49 ` Rob Herring 2015-01-29 16:49 ` Rob Herring 2015-01-30 0:24 ` Laurent Pinchart 2015-01-30 0:24 ` Laurent Pinchart 2015-01-30 0:24 ` Laurent Pinchart 2015-01-30 0:24 ` Laurent Pinchart 2015-01-30 15:23 ` Murali Karicheri 2015-01-30 15:23 ` Murali Karicheri 2015-01-30 15:23 ` Murali Karicheri 2015-01-30 15:23 ` Murali Karicheri 2015-01-23 22:32 ` [PATCH v4 2/6] of: move of_dma_configure() to device.c to help re-use Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` [PATCH v4 3/6] of: fix size when dma-range is not used Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-27 11:27 ` Robin Murphy [this message] 2015-01-27 11:27 ` Robin Murphy 2015-01-27 11:27 ` Robin Murphy 2015-01-27 15:44 ` Murali Karicheri 2015-01-27 15:44 ` Murali Karicheri 2015-01-27 15:44 ` Murali Karicheri 2015-01-27 18:55 ` Murali Karicheri 2015-01-27 18:55 ` Murali Karicheri 2015-01-27 18:55 ` Murali Karicheri 2015-01-27 18:55 ` Murali Karicheri 2015-01-28 11:05 ` Catalin Marinas 2015-01-28 11:05 ` Catalin Marinas 2015-01-28 11:05 ` Catalin Marinas 2015-01-28 11:05 ` Catalin Marinas 2015-01-28 15:45 ` Rob Herring 2015-01-28 15:45 ` Rob Herring 2015-01-28 15:45 ` Rob Herring 2015-01-28 15:45 ` Rob Herring 2015-01-28 17:23 ` Catalin Marinas 2015-01-28 17:23 ` Catalin Marinas 2015-01-28 17:23 ` Catalin Marinas 2015-01-28 17:23 ` Catalin Marinas 2015-01-28 17:34 ` Murali Karicheri 2015-01-28 17:34 ` Murali Karicheri 2015-01-28 17:34 ` Murali Karicheri 2015-01-28 17:34 ` Murali Karicheri 2015-01-28 15:55 ` Robin Murphy 2015-01-28 15:55 ` Robin Murphy 2015-01-28 15:55 ` Robin Murphy 2015-01-28 15:55 ` Robin Murphy 2015-01-28 17:30 ` Catalin Marinas 2015-01-28 17:30 ` Catalin Marinas 2015-01-28 17:30 ` Catalin Marinas 2015-01-28 17:30 ` Catalin Marinas 2015-01-30 18:06 ` Murali Karicheri 2015-01-30 18:06 ` Murali Karicheri 2015-01-30 18:06 ` Murali Karicheri 2015-02-02 12:18 ` Catalin Marinas 2015-02-02 12:18 ` Catalin Marinas 2015-02-02 12:18 ` Catalin Marinas 2015-02-02 12:18 ` Catalin Marinas 2015-02-02 16:10 ` Murali Karicheri 2015-02-02 16:10 ` Murali Karicheri 2015-02-02 16:10 ` Murali Karicheri 2015-02-02 16:10 ` Murali Karicheri 2015-02-05 21:42 ` Murali Karicheri 2015-02-05 21:42 ` Murali Karicheri 2015-02-05 21:42 ` Murali Karicheri 2015-02-05 22:44 ` Catalin Marinas 2015-02-05 22:44 ` Catalin Marinas 2015-02-05 22:44 ` Catalin Marinas 2015-02-05 22:44 ` Catalin Marinas 2015-01-23 22:32 ` [PATCH v4 4/6] of/pci: add of_pci_dma_configure() update dma configuration Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 23:41 ` Bjorn Helgaas 2015-01-23 23:41 ` Bjorn Helgaas 2015-01-23 23:41 ` Bjorn Helgaas 2015-01-26 23:25 ` Murali Karicheri 2015-01-26 23:25 ` Murali Karicheri 2015-01-26 23:25 ` Murali Karicheri 2015-01-26 23:59 ` Bjorn Helgaas 2015-01-26 23:59 ` Bjorn Helgaas 2015-01-26 23:59 ` Bjorn Helgaas 2015-01-27 18:14 ` Murali Karicheri 2015-01-27 18:14 ` Murali Karicheri 2015-01-27 18:14 ` Murali Karicheri 2015-01-27 18:42 ` Bjorn Helgaas 2015-01-27 18:42 ` Bjorn Helgaas 2015-01-27 18:42 ` Bjorn Helgaas 2015-01-27 18:45 ` Murali Karicheri 2015-01-27 18:45 ` Murali Karicheri 2015-01-27 18:45 ` Murali Karicheri 2015-01-23 22:32 ` [PATCH v4 5/6] PCI: update dma configuration from DT Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 23:27 ` Bjorn Helgaas 2015-01-23 23:27 ` Bjorn Helgaas 2015-01-23 23:27 ` Bjorn Helgaas 2015-01-26 23:28 ` Murali Karicheri 2015-01-26 23:28 ` Murali Karicheri 2015-01-26 23:28 ` Murali Karicheri 2015-01-23 22:32 ` [PATCH v4 6/6] arm: dma-mapping: updates to limit dma_mask and iommu mapping size Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-23 22:32 ` Murali Karicheri 2015-01-27 11:12 ` Robin Murphy 2015-01-27 11:12 ` Robin Murphy 2015-01-27 11:12 ` Robin Murphy 2015-01-27 11:12 ` Robin Murphy 2015-01-27 11:34 ` Catalin Marinas 2015-01-27 11:34 ` Catalin Marinas 2015-01-27 11:34 ` Catalin Marinas 2015-01-27 11:34 ` Catalin Marinas 2015-01-27 15:19 ` Murali Karicheri 2015-01-27 15:19 ` Murali Karicheri 2015-01-27 15:19 ` Murali Karicheri 2015-01-27 15:19 ` Murali Karicheri
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=54C77616.80301@arm.com \ --to=robin.murphy@arm.com \ --cc=Will.Deacon@arm.com \ --cc=arnd@arndb.de \ --cc=bhelgaas@google.com \ --cc=devicetree@vger.kernel.org \ --cc=grant.likely@linaro.org \ --cc=iommu@lists.linux-foundation.org \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=m-karicheri2@ti.com \ --cc=robh+dt@kernel.org \ --cc=suravee.suthikulpanit@amd.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.