1 files changed, 44 insertions, 16 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 2b2bb3f9b683..24c1d3c30186 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/mmiotrace.h>
 
 #include <asm/cacheflush.h>
 #include <asm/e820.h>
@@ -122,10 +123,13 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
 {
         unsigned long pfn, offset, vaddr;
         resource_size_t last_addr;
+        const resource_size_t unaligned_phys_addr = phys_addr;
+        const unsigned long unaligned_size = size;
         struct vm_struct *area;
         unsigned long new_prot_val;
         pgprot_t prot;
         int retval;
+        void __iomem *ret_addr;
 
         /* Don't allow wraparound or zero size */
         last_addr = phys_addr + size - 1;
@@ -142,7 +146,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         /*
          * Don't remap the low PCI/ISA area, it's always mapped..
          */
-        if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS)
+        if (is_ISA_range(phys_addr, last_addr))
                 return (__force void __iomem *)phys_to_virt(phys_addr);
 
         /*
@@ -233,7 +237,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
                 return NULL;
         }
 
-        return (void __iomem *) (vaddr + offset);
+        ret_addr = (void __iomem *) (vaddr + offset);
+        mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr);
+
+        return ret_addr;
 }
 
 /**
@@ -261,7 +268,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
 {
         /*
          * Ideally, this should be:
-         *      pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
+         *      pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
          *
          * Till we fix all X drivers to use ioremap_wc(), we will use
          * UC MINUS.
@@ -285,7 +292,7 @@ EXPORT_SYMBOL(ioremap_nocache);
  */
 void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
 {
-        if (pat_wc_enabled)
+        if (pat_enabled)
                 return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
                                         __builtin_return_address(0));
         else
@@ -300,6 +307,29 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
 }
 EXPORT_SYMBOL(ioremap_cache);
 
+static void __iomem *ioremap_default(resource_size_t phys_addr,
+                                        unsigned long size)
+{
+        unsigned long flags;
+        void *ret;
+        int err;
+
+        /*
+         * - WB for WB-able memory and no other conflicting mappings
+         * - UC_MINUS for non-WB-able memory with no other conflicting mappings
+         * - Inherit from confliting mappings otherwise
+         */
+        err = reserve_memtype(phys_addr, phys_addr + size, -1, &flags);
+        if (err < 0)
+                return NULL;
+
+        ret = (void *) __ioremap_caller(phys_addr, size, flags,
+                                        __builtin_return_address(0));
+
+        free_memtype(phys_addr, phys_addr + size);
+        return (void __iomem *)ret;
+}
+
 /**
  * iounmap - Free a IO remapping
  * @addr: virtual address from ioremap_*
@@ -318,13 +348,15 @@ void iounmap(volatile void __iomem *addr)
          * vm_area and by simply returning an address into the kernel mapping
          * of ISA space.   So handle that here.
          */
-        if (addr >= phys_to_virt(ISA_START_ADDRESS) &&
-            addr < phys_to_virt(ISA_END_ADDRESS))
+        if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) &&
+            (void __force *)addr < phys_to_virt(ISA_END_ADDRESS))
                 return;
 
         addr = (volatile void __iomem *)
                 (PAGE_MASK & (unsigned long __force)addr);
 
+        mmiotrace_iounmap(addr);
+
         /* Use the vm area unlocked, assuming the caller
            ensures there isn't another iounmap for the same address
            in parallel. Reuse of the virtual address is prevented by
@@ -332,7 +364,7 @@ void iounmap(volatile void __iomem *addr)
            cpa takes care of the direct mappings. */
         read_lock(&vmlist_lock);
         for (p = vmlist; p; p = p->next) {
-                if (p->addr == addr)
+                if (p->addr == (void __force *)addr)
                         break;
         }
         read_unlock(&vmlist_lock);
@@ -346,7 +378,7 @@ void iounmap(volatile void __iomem *addr)
         free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p));
 
         /* Finally remove it */
-        o = remove_vm_area((void *)addr);
+        o = remove_vm_area((void __force *)addr);
         BUG_ON(p != o || o == NULL);
         kfree(p);
 }
@@ -365,7 +397,7 @@ void *xlate_dev_mem_ptr(unsigned long phys)
         if (page_is_ram(start >> PAGE_SHIFT))
                 return __va(phys);
 
-        addr = (void *)ioremap(start, PAGE_SIZE);
+        addr = (void __force *)ioremap_default(start, PAGE_SIZE);
         if (addr)
                 addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
 
@@ -381,8 +413,6 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
         return;
 }
 
-#ifdef CONFIG_X86_32
-
 int __initdata early_ioremap_debug;
 
 static int __init early_ioremap_debug_setup(char *str)
@@ -394,8 +424,7 @@ static int __init early_ioremap_debug_setup(char *str)
 early_param("early_ioremap_debug", early_ioremap_debug_setup);
 
 static __initdata int after_paging_init;
-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)]
-                __section(.bss.page_aligned);
+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
 
 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
 {
@@ -484,10 +513,11 @@ static void __init __early_set_fixmap(enum fixed_addresses idx,
                 return;
         }
         pte = early_ioremap_pte(addr);
+
         if (pgprot_val(flags))
                 set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags));
         else
-                pte_clear(NULL, addr, pte);
+                pte_clear(&init_mm, addr, pte);
         __flush_tlb_one(addr);
 }
 
@@ -625,5 +655,3 @@ void __this_fixmap_does_not_exist(void)
 {
         WARN_ON(1);
 }
-
-#endif /* CONFIG_X86_32 */