1 files changed, 34 insertions, 46 deletions

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 0ac615c0f798..d6167ad4e011 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -32,6 +32,9 @@
 #include <asm/tlbflush.h>
 #include <asm/sizes.h>
 
+#include <asm/mach/map.h>
+#include "mm.h"
+
 /*
  * Used by ioremap() and iounmap() code to mark (super)section-mapped
  * I/O regions in vm_struct->flags field.
@@ -39,8 +42,9 @@
 #define VM_ARM_SECTION_MAPPING  0x80000000
 
 static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end,
-                          unsigned long phys_addr, pgprot_t prot)
+                          unsigned long phys_addr, const struct mem_type *type)
 {
+        pgprot_t prot = __pgprot(type->prot_pte);
         pte_t *pte;
 
         pte = pte_alloc_kernel(pmd, addr);
@@ -51,7 +55,8 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end,
                 if (!pte_none(*pte))
                         goto bad;
 
-                set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), 0);
+                set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot),
+                            type->prot_pte_ext);
                 phys_addr += PAGE_SIZE;
         } while (pte++, addr += PAGE_SIZE, addr != end);
         return 0;
@@ -63,7 +68,7 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end,
 
 static inline int remap_area_pmd(pgd_t *pgd, unsigned long addr,
                                  unsigned long end, unsigned long phys_addr,
-                                 pgprot_t prot)
+                                 const struct mem_type *type)
 {
         unsigned long next;
         pmd_t *pmd;
@@ -75,7 +80,7 @@ static inline int remap_area_pmd(pgd_t *pgd, unsigned long addr,
 
         do {
                 next = pmd_addr_end(addr, end);
-                ret = remap_area_pte(pmd, addr, next, phys_addr, prot);
+                ret = remap_area_pte(pmd, addr, next, phys_addr, type);
                 if (ret)
                         return ret;
                 phys_addr += next - addr;
@@ -84,13 +89,11 @@ static inline int remap_area_pmd(pgd_t *pgd, unsigned long addr,
 }
 
 static int remap_area_pages(unsigned long start, unsigned long pfn,
-                            unsigned long size, unsigned long flags)
+                            size_t size, const struct mem_type *type)
 {
         unsigned long addr = start;
         unsigned long next, end = start + size;
         unsigned long phys_addr = __pfn_to_phys(pfn);
-        pgprot_t prot = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG |
-                                 L_PTE_DIRTY | L_PTE_WRITE | flags);
         pgd_t *pgd;
         int err = 0;
 
@@ -98,7 +101,7 @@ static int remap_area_pages(unsigned long start, unsigned long pfn,
         pgd = pgd_offset_k(addr);
         do {
                 next = pgd_addr_end(addr, end);
-                err = remap_area_pmd(pgd, addr, next, phys_addr, prot);
+                err = remap_area_pmd(pgd, addr, next, phys_addr, type);
                 if (err)
                         break;
                 phys_addr += next - addr;
@@ -178,9 +181,9 @@ static void unmap_area_sections(unsigned long virt, unsigned long size)
 
 static int
 remap_area_sections(unsigned long virt, unsigned long pfn,
-                    unsigned long size, unsigned long flags)
+                    size_t size, const struct mem_type *type)
 {
-        unsigned long prot, addr = virt, end = virt + size;
+        unsigned long addr = virt, end = virt + size;
         pgd_t *pgd;
 
         /*
@@ -189,23 +192,13 @@ remap_area_sections(unsigned long virt, unsigned long pfn,
          */
         unmap_area_sections(virt, size);
 
-        prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO) |
-               (flags & (L_PTE_CACHEABLE | L_PTE_BUFFERABLE));
-
-        /*
-         * ARMv6 and above need XN set to prevent speculative prefetches
-         * hitting IO.
-         */
-        if (cpu_architecture() >= CPU_ARCH_ARMv6)
-                prot |= PMD_SECT_XN;
-
         pgd = pgd_offset_k(addr);
         do {
                 pmd_t *pmd = pmd_offset(pgd, addr);
 
-                pmd[0] = __pmd(__pfn_to_phys(pfn) | prot);
+                pmd[0] = __pmd(__pfn_to_phys(pfn) | type->prot_sect);
                 pfn += SZ_1M >> PAGE_SHIFT;
-                pmd[1] = __pmd(__pfn_to_phys(pfn) | prot);
+                pmd[1] = __pmd(__pfn_to_phys(pfn) | type->prot_sect);
                 pfn += SZ_1M >> PAGE_SHIFT;
                 flush_pmd_entry(pmd);
 
@@ -218,9 +211,9 @@ remap_area_sections(unsigned long virt, unsigned long pfn,
 
 static int
 remap_area_supersections(unsigned long virt, unsigned long pfn,
-                         unsigned long size, unsigned long flags)
+                         size_t size, const struct mem_type *type)
 {
-        unsigned long prot, addr = virt, end = virt + size;
+        unsigned long addr = virt, end = virt + size;
         pgd_t *pgd;
 
         /*
@@ -229,22 +222,12 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,
          */
         unmap_area_sections(virt, size);
 
-        prot = PMD_TYPE_SECT | PMD_SECT_SUPER | PMD_SECT_AP_WRITE |
-                        PMD_DOMAIN(DOMAIN_IO) |
-                        (flags & (L_PTE_CACHEABLE | L_PTE_BUFFERABLE));
-
-        /*
-         * ARMv6 and above need XN set to prevent speculative prefetches
-         * hitting IO.
-         */
-        if (cpu_architecture() >= CPU_ARCH_ARMv6)
-                prot |= PMD_SECT_XN;
-
         pgd = pgd_offset_k(virt);
         do {
                 unsigned long super_pmd_val, i;
 
-                super_pmd_val = __pfn_to_phys(pfn) | prot;
+                super_pmd_val = __pfn_to_phys(pfn) | type->prot_sect |
+                                PMD_SECT_SUPER;
                 super_pmd_val |= ((pfn >> (32 - PAGE_SHIFT)) & 0xf) << 20;
 
                 for (i = 0; i < 8; i++) {
@@ -279,9 +262,10 @@ remap_area_supersections(unsigned long virt, unsigned long pfn,
  * mapping.  See include/asm-arm/proc-armv/pgtable.h for more information.
  */
 void __iomem *
-__ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
-              unsigned long flags)
+__arm_ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
+                  unsigned int mtype)
 {
+        const struct mem_type *type;
         int err;
         unsigned long addr;
         struct vm_struct * area;
@@ -292,6 +276,10 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
         if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
                 return NULL;
 
+        type = get_mem_type(mtype);
+        if (!type)
+                return NULL;
+
         size = PAGE_ALIGN(size);
 
         area = get_vm_area(size, VM_IOREMAP);
@@ -302,16 +290,16 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
 #ifndef CONFIG_SMP
         if (DOMAIN_IO == 0 &&
             (((cpu_architecture() >= CPU_ARCH_ARMv6) && (get_cr() & CR_XP)) ||
-               cpu_is_xsc3()) &&
+               cpu_is_xsc3()) && pfn >= 0x100000 &&
                !((__pfn_to_phys(pfn) | size | addr) & ~SUPERSECTION_MASK)) {
                 area->flags |= VM_ARM_SECTION_MAPPING;
-                err = remap_area_supersections(addr, pfn, size, flags);
+                err = remap_area_supersections(addr, pfn, size, type);
         } else if (!((__pfn_to_phys(pfn) | size | addr) & ~PMD_MASK)) {
                 area->flags |= VM_ARM_SECTION_MAPPING;
-                err = remap_area_sections(addr, pfn, size, flags);
+                err = remap_area_sections(addr, pfn, size, type);
         } else
 #endif
-                err = remap_area_pages(addr, pfn, size, flags);
+                err = remap_area_pages(addr, pfn, size, type);
 
         if (err) {
                 vunmap((void *)addr);
@@ -321,10 +309,10 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
         flush_cache_vmap(addr, addr + size);
         return (void __iomem *) (offset + addr);
 }
-EXPORT_SYMBOL(__ioremap_pfn);
+EXPORT_SYMBOL(__arm_ioremap_pfn);
 
 void __iomem *
-__ioremap(unsigned long phys_addr, size_t size, unsigned long flags)
+__arm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
 {
         unsigned long last_addr;
         unsigned long offset = phys_addr & ~PAGE_MASK;
@@ -342,9 +330,9 @@ __ioremap(unsigned long phys_addr, size_t size, unsigned long flags)
          */
         size = PAGE_ALIGN(last_addr + 1) - phys_addr;
 
-        return __ioremap_pfn(pfn, offset, size, flags);
+        return __arm_ioremap_pfn(pfn, offset, size, mtype);
 }
-EXPORT_SYMBOL(__ioremap);
+EXPORT_SYMBOL(__arm_ioremap);
 
 void __iounmap(volatile void __iomem *addr)
 {