From 580d517cd99fa98a954ec68481124cc61e7213ce Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Fri, 8 Feb 2008 16:37:03 +1100
Subject: [PATCH] --- yaml --- r: 84874 b: refs/heads/master c:
 0e0b47abb71a2c4aed5895c01f41827dbd8a981c h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/powerpc/platforms/cell/iommu.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b3aaf3e0c53..0d60ec49f4b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccd05d086f82dba2ab117dcaf4a38cbb2863a439
+refs/heads/master: 0e0b47abb71a2c4aed5895c01f41827dbd8a981c
diff --git a/trunk/arch/powerpc/platforms/cell/iommu.c b/trunk/arch/powerpc/platforms/cell/iommu.c
index a276064471b3..1f7b25474086 100644
--- a/trunk/arch/powerpc/platforms/cell/iommu.c
+++ b/trunk/arch/powerpc/platforms/cell/iommu.c
@@ -917,6 +917,18 @@ static int __init cell_iommu_fixed_mapping_init(void)
 		return -1;
 	}
 
+	/* We must have dma-ranges properties for fixed mapping to work */
+	for (np = NULL; (np = of_find_all_nodes(np));) {
+		if (of_find_property(np, "dma-ranges", NULL))
+			break;
+	}
+	of_node_put(np);
+
+	if (!np) {
+		pr_debug("iommu: no dma-ranges found, no fixed mapping\n");
+		return -1;
+	}
+
 	/* The default setup is to have the fixed mapping sit after the
 	 * dynamic region, so find the top of the largest IOMMU window
 	 * on any axon, then add the size of RAM and that's our max value.