summaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorMurali Karicheri <m-karicheri2@ti.com>2015-03-03 12:52:10 -0500
committerBjorn Helgaas <bhelgaas@google.com>2015-03-03 14:42:56 -0600
commit0c79c81c779fe54e67c0ce8c1fda551ca57d8a35 (patch)
tree0abd05512351bc8cd1d93a0d4af344a217368222 /drivers/of
parent1f5c69aa51f9c7c8d2a5c2e4dc339f6c7d5c15cd (diff)
downloadlinux-0c79c81c779fe54e67c0ce8c1fda551ca57d8a35.tar.gz
linux-0c79c81c779fe54e67c0ce8c1fda551ca57d8a35.tar.bz2
linux-0c79c81c779fe54e67c0ce8c1fda551ca57d8a35.zip
of: Fix size when dma-range is not used
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. Tested-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> (AMD Seattle) Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Will Deacon <will.deacon@arm.com> CC: Joerg Roedel <joro@8bytes.org> CC: Grant Likely <grant.likely@linaro.org> CC: Rob Herring <robh+dt@kernel.org> CC: Russell King <linux@arm.linux.org.uk> CC: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/device.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 31a7875b34a4..28e743888402 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;
+ }
dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", offset);
}