powerpc/mm: Use a helper for finding pte bits mapping I/O area

Use a helper instead of open coding with constants. A later patch will
drop the WIMG bits and use PowerISA 3.0 defines.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index 41c011c..8275858 100644 (file)
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -162,7 +162,7 @@ void btext_map(void)
        offset = ((unsigned long) dispDeviceBase) - base;
        size = dispDeviceRowBytes * dispDeviceRect[3] + offset
                + dispDeviceRect[0];
-       vbase = __ioremap(base, size, _PAGE_NO_CACHE);
+       vbase = __ioremap(base, size, pgprot_val(pgprot_noncached_wc(__pgprot(0))));
        if (vbase == 0)
                return;
        logicalDisplayBase = vbase + offset;

diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
index 0f19970..ae13161 100644 (file)
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -109,14 +109,14 @@ static void pci_process_ISA_OF_ranges(struct device_node *isa_node,
                size = 0x10000;
 
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
-                    size, _PAGE_NO_CACHE|_PAGE_GUARDED);
+                    size, pgprot_val(pgprot_noncached(__pgprot(0))));
        return;
 
 inval_range:
        printk(KERN_ERR "no ISA IO ranges or unexpected isa range, "
               "mapping 64k\n");
        __ioremap_at(phb_io_base_phys, (void *)ISA_IO_BASE,
-                    0x10000, _PAGE_NO_CACHE|_PAGE_GUARDED);
+                    0x10000, pgprot_val(pgprot_noncached(__pgprot(0))));
 }
 
 

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 60bb187..41503d7 100644 (file)
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -159,7 +159,7 @@ static int pcibios_map_phb_io_space(struct pci_controller *hose)
 
        /* Establish the mapping */
        if (__ioremap_at(phys_page, area->addr, size_page,
-                        _PAGE_NO_CACHE | _PAGE_GUARDED) == NULL)
+                        pgprot_val(pgprot_noncached(__pgprot(0)))) == NULL)
                return -ENOMEM;
 
        /* Fixup hose IO resource */

diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 9e0553e..ea60a24 100644 (file)
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -253,7 +253,7 @@ void __iomem * __ioremap(phys_addr_t addr, unsigned long size,
 
 void __iomem * ioremap(phys_addr_t addr, unsigned long size)
 {
-       unsigned long flags = _PAGE_NO_CACHE | _PAGE_GUARDED;
+       unsigned long flags = pgprot_val(pgprot_noncached(__pgprot(0)));
        void *caller = __builtin_return_address(0);
 
        if (ppc_md.ioremap)
@@ -263,7 +263,7 @@ void __iomem * ioremap(phys_addr_t addr, unsigned long size)
 
 void __iomem * ioremap_wc(phys_addr_t addr, unsigned long size)
 {
-       unsigned long flags = _PAGE_NO_CACHE;
+       unsigned long flags = pgprot_val(pgprot_noncached_wc(__pgprot(0)));
        void *caller = __builtin_return_address(0);
 
        if (ppc_md.ioremap)

diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 5e8a40f..492b257 100644 (file)
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -216,7 +216,7 @@ static int __init setup_areas(struct spu *spu)
        }
 
        spu->local_store = (__force void *)ioremap_prot(spu->local_store_phys,
-               LS_SIZE, _PAGE_NO_CACHE);
+               LS_SIZE, pgprot_val(pgprot_noncached_wc(__pgprot(0))));
 
        if (!spu->local_store) {
                pr_debug("%s:%d: ioremap local_store failed\n",

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 61cf61a..4d7bc3f 100644 (file)
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -228,7 +228,7 @@ static int electra_cf_probe(struct platform_device *ofdev)
 
        if (!cf->mem_base || !cf->io_virt || !cf->gpio_base ||
            (__ioremap_at(io.start, cf->io_virt, cf->io_size,
-               _PAGE_NO_CACHE | _PAGE_GUARDED) == NULL)) {
+                 pgprot_val(pgprot_noncached(__pgprot(0)))) == NULL)) {
                dev_err(device, "can't ioremap ranges\n");
                status = -ENOMEM;
                goto fail1;