[POWERPC] PS3: Map SPU regions as non-guarded

Use ioremap_flags() to map SPU regions as non-guarded.
Change the use of _ioremap() to ioremap_flags().

CC: Arnd Bergmann <arnd.bergmann@de.ibm.com>
CC: Masato Noguchi <Masato.Noguchi@jp.sony.com>
CC: Takao Shinohara <shin@sm.sony.co.jp>
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 10 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 17414e8d7dd3..0f4eb1251d7f 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -273,7 +273,7 @@ void __init ps3_map_htab(void)
 
         result = lv1_map_htab(0, &htab_addr);
 
-        htab = (struct hash_pte *)__ioremap(htab_addr, htab_size,
+        htab = (__force struct hash_pte *)ioremap_flags(htab_addr, htab_size,
                                             pgprot_val(PAGE_READONLY_X));
 
         DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__,
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 651437cb2c18..c7f734c89462 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -182,15 +182,18 @@ static int __init setup_areas(struct spu *spu)
 {
         struct table {char* name; unsigned long addr; unsigned long size;};
 
-        spu_pdata(spu)->shadow = __ioremap(
-                spu_pdata(spu)->shadow_addr, sizeof(struct spe_shadow),
-                pgprot_val(PAGE_READONLY) | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        spu_pdata(spu)->shadow = ioremap_flags(spu_pdata(spu)->shadow_addr,
+                                               sizeof(struct spe_shadow),
+                                               pgprot_val(PAGE_READONLY) |
+                                               _PAGE_NO_CACHE);
         if (!spu_pdata(spu)->shadow) {
                 pr_debug("%s:%d: ioremap shadow failed\n", __func__, __LINE__);
                 goto fail_ioremap;
         }
 
-        spu->local_store = ioremap(spu->local_store_phys, LS_SIZE);
+        spu->local_store = (__force void *)ioremap_flags(spu->local_store_phys,
+                LS_SIZE, _PAGE_NO_CACHE);
+
         if (!spu->local_store) {
                 pr_debug("%s:%d: ioremap local_store failed\n",
                         __func__, __LINE__);
@@ -199,6 +202,7 @@ static int __init setup_areas(struct spu *spu)
 
         spu->problem = ioremap(spu->problem_phys,
                 sizeof(struct spu_problem));
+
         if (!spu->problem) {
                 pr_debug("%s:%d: ioremap problem failed\n", __func__, __LINE__);
                 goto fail_ioremap;
@@ -206,6 +210,7 @@ static int __init setup_areas(struct spu *spu)
 
         spu->priv2 = ioremap(spu_pdata(spu)->priv2_addr,
                 sizeof(struct spu_priv2));
+
         if (!spu->priv2) {
                 pr_debug("%s:%d: ioremap priv2 failed\n", __func__, __LINE__);
                 goto fail_ioremap;