sh: Prevent 64-bit pgprot clobbering across ioremap implementations.

Presently 'flags' gets passed around a lot between the various ioremap
helpers and implementations, which is only 32-bits. In the X2TLB case
we use 64-bit pgprots which presently results in the upper 32bits being
chopped off (which handily include our read/write/exec permissions).

As such, we convert everything internally to using pgprot_t directly and
simply convert over with pgprot_val() where needed. With this in place,
transparent fixmap utilization for early ioremap works as expected.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

4 files changed, 6 insertions, 6 deletions

diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index 511de38d2046..fe7e686c94ac 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -21,6 +21,7 @@
 #include <linux/i2c-algo-pca.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/errno.h>
 #include <mach/sh7785lcr.h>
@@ -332,15 +333,14 @@ static void __init sh7785lcr_setup(char **cmdline_p)
         pm_power_off = sh7785lcr_power_off;
 
         /* sm501 DRAM configuration */
-        sm501_reg = ioremap_fixed(SM107_REG_ADDR, SM501_DRAM_CONTROL,
-                                  PAGE_KERNEL);
+        sm501_reg = ioremap_nocache(SM107_REG_ADDR, SM501_DRAM_CONTROL);
         if (!sm501_reg) {
                 printk(KERN_ERR "%s: ioremap error.\n", __func__);
                 return;
         }
 
         writel(0x000307c2, sm501_reg + SM501_DRAM_CONTROL);
-        iounmap_fixed(sm501_reg);
+        iounmap(sm501_reg);
 }
 
 /* Return the board specific boot mode pin configuration */
diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
index db22ea2e6d49..59816355d199 100644
--- a/arch/sh/boards/mach-landisk/setup.c
+++ b/arch/sh/boards/mach-landisk/setup.c
@@ -63,7 +63,7 @@ static int __init landisk_devices_setup(void)
         /* open I/O area window */
         paddrbase = virt_to_phys((void *)PA_AREA5_IO);
         prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
-        cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
+        cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot);
         if (!cf_ide_base) {
                 printk("allocate_cf_area : can't open CF I/O window!\n");
                 return -ENOMEM;
diff --git a/arch/sh/boards/mach-lboxre2/setup.c b/arch/sh/boards/mach-lboxre2/setup.c
index 2b0b5818e1e4..408dd5df7d45 100644
--- a/arch/sh/boards/mach-lboxre2/setup.c
+++ b/arch/sh/boards/mach-lboxre2/setup.c
@@ -57,7 +57,7 @@ static int __init lboxre2_devices_setup(void)
         paddrbase = virt_to_phys((void*)PA_AREA5_IO);
         psize = PAGE_SIZE;
         prot = PAGE_KERNEL_PCC( 1 , _PAGE_PCC_IO16);
-        cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot.pgprot);
+        cf0_io_base = (u32)p3_ioremap(paddrbase, psize, prot);
         if (!cf0_io_base) {
                 printk(KERN_ERR "%s : can't open CF I/O window!\n" , __func__ );
                 return -ENOMEM;
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
index 74cfb4b8b03d..f14ba0fa950b 100644
--- a/arch/sh/boards/mach-sh03/setup.c
+++ b/arch/sh/boards/mach-sh03/setup.c
@@ -82,7 +82,7 @@ static int __init sh03_devices_setup(void)
         /* open I/O area window */
         paddrbase = virt_to_phys((void *)PA_AREA5_IO);
         prot = PAGE_KERNEL_PCC(1, _PAGE_PCC_IO16);
-        cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot.pgprot);
+        cf_ide_base = p3_ioremap(paddrbase, PAGE_SIZE, prot);
         if (!cf_ide_base) {
                 printk("allocate_cf_area : can't open CF I/O window!\n");
                 return -ENOMEM;