From: Murali Karicheri <m-karicheri2@ti.com>
To: <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: Murali Karicheri <m-karicheri2@ti.com>,
Joerg Roedel <joro@8bytes.org>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Will Deacon <will.deacon@arm.com>,
Russell King <linux@arm.linux.org.uk>,
Arnd Bergmann <arnd@arndb.de>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH v5 3/8] of: fix size when dma-range is not used
Date: Tue, 27 Jan 2015 16:00:00 -0500 [thread overview]
Message-ID: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> (raw)
In-Reply-To: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com>
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 <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 | 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;
+ }
+
dev->dma_pfn_offset = offset;
coherent = of_dma_is_coherent(np);
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>
To: 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 <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>,
Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>,
Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>,
Grant Likely
<grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: [PATCH v5 3/8] of: fix size when dma-range is not used
Date: Tue, 27 Jan 2015 16:00:00 -0500 [thread overview]
Message-ID: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> (raw)
In-Reply-To: <1422392405-32196-1-git-send-email-m-karicheri2-l0cyMroinI0@public.gmane.org>
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 <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
Cc: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>
Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>
Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
Cc: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org>
Signed-off-by: Murali Karicheri <m-karicheri2-l0cyMroinI0@public.gmane.org>
---
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;
+ }
+
dev->dma_pfn_offset = offset;
coherent = of_dma_is_coherent(np);
--
1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: m-karicheri2@ti.com (Murali Karicheri)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 3/8] of: fix size when dma-range is not used
Date: Tue, 27 Jan 2015 16:00:00 -0500 [thread overview]
Message-ID: <1422392405-32196-4-git-send-email-m-karicheri2@ti.com> (raw)
In-Reply-To: <1422392405-32196-1-git-send-email-m-karicheri2@ti.com>
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 <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 | 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;
+ }
+
dev->dma_pfn_offset = offset;
coherent = of_dma_is_coherent(np);
--
1.7.9.5
next prev parent reply other threads:[~2015-01-27 21:01 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 20:59 [PATCH v5 0/8] PCI: get DMA configuration from parent device Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-27 20:59 ` [PATCH v5 1/8] of: iommu: add ptr to OF node arg to of_iommu_configure() Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-28 2:18 ` Rob Herring
2015-01-28 2:18 ` Rob Herring
2015-01-28 2:18 ` Rob Herring
2015-01-28 2:18 ` Rob Herring
2015-01-27 20:59 ` [PATCH v5 2/8] of: move of_dma_configure() to device.c to help re-use Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-27 20:59 ` Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri [this message]
2015-01-27 21:00 ` [PATCH v5 3/8] of: fix size when dma-range is not used Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-28 2:37 ` Rob Herring
2015-01-28 2:37 ` Rob Herring
2015-01-28 2:37 ` Rob Herring
2015-01-28 2:37 ` Rob Herring
2015-01-28 11:21 ` Robin Murphy
2015-01-28 11:21 ` Robin Murphy
2015-01-28 11:21 ` Robin Murphy
2015-01-28 11:21 ` Robin Murphy
2015-01-28 15:28 ` Murali Karicheri
2015-01-28 15:28 ` Murali Karicheri
2015-01-28 15:28 ` Murali Karicheri
2015-01-28 15:28 ` Murali Karicheri
2015-01-27 21:00 ` [PATCH v5 4/8] PCI: add helper functions pci_get[put]_host_bridge_device() Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` [PATCH v5 5/8] of/pci: add of_pci_dma_configure() update dma configuration Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-28 2:49 ` Rob Herring
2015-01-28 2:49 ` Rob Herring
2015-01-28 2:49 ` Rob Herring
2015-01-28 2:49 ` Rob Herring
2015-01-27 21:00 ` [PATCH v5 6/8] PCI: update dma configuration from DT Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` [PATCH v5 7/8] arm: dma-mapping: limit iommu mapping size Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` [PATCH v5 8/8] of: limit dma_mask of the device based on dma-range size Murali Karicheri
2015-01-27 21:00 ` Murali Karicheri
2015-01-27 21:00 ` 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=1422392405-32196-4-git-send-email-m-karicheri2@ti.com \
--to=m-karicheri2@ti.com \
--cc=Suravee.Suthikulpanit@amd.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=robh+dt@kernel.org \
--cc=will.deacon@arm.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: link
Be 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.