[PATCH] powerpc: use guarded ioremap for cell on-chip mappings

I'm not sure where the information came from, but I assumed
that doing cache-inhibited mappings for mmio regions was
sufficient.

It seems we also need the guarded bit set, like everyone
else, which is the default for ioremap.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index c8a98be8b6a1..a49ceb799a8e 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -344,8 +344,8 @@ static int cell_map_iommu_hardcoded(int num_nodes)
 
         /* node 0 */
         iommu = &cell_iommus[0];
-        iommu->mapped_base = __ioremap(0x20000511000, 0x1000, _PAGE_NO_CACHE);
-        iommu->mapped_mmio_base = __ioremap(0x20000510000, 0x1000, _PAGE_NO_CACHE);
+        iommu->mapped_base = ioremap(0x20000511000, 0x1000);
+        iommu->mapped_mmio_base = ioremap(0x20000510000, 0x1000);
 
         enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
 
@@ -357,8 +357,8 @@ static int cell_map_iommu_hardcoded(int num_nodes)
 
         /* node 1 */
         iommu = &cell_iommus[1];
-        iommu->mapped_base = __ioremap(0x30000511000, 0x1000, _PAGE_NO_CACHE);
-        iommu->mapped_mmio_base = __ioremap(0x30000510000, 0x1000, _PAGE_NO_CACHE);
+        iommu->mapped_base = ioremap(0x30000511000, 0x1000);
+        iommu->mapped_mmio_base = ioremap(0x30000510000, 0x1000);
 
         enable_mapping(iommu->mapped_base, iommu->mapped_mmio_base);
 
@@ -407,8 +407,8 @@ static int cell_map_iommu(void)
                 iommu->base = *base;
                 iommu->mmio_base = *mmio_base;
 
-                iommu->mapped_base = __ioremap(*base, 0x1000, _PAGE_NO_CACHE);
-                iommu->mapped_mmio_base = __ioremap(*mmio_base, 0x1000, _PAGE_NO_CACHE);
+                iommu->mapped_base = ioremap(*base, 0x1000);
+                iommu->mapped_mmio_base = ioremap(*mmio_base, 0x1000);
 
                 enable_mapping(iommu->mapped_base,
                                iommu->mapped_mmio_base);