2 files changed, 76 insertions, 0 deletions

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 88fd86cf3d9a..904c15e86063 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -39,6 +39,70 @@
 #include <asm/mach/pci.h>
 #include "mm.h"
 
+
+LIST_HEAD(static_vmlist);
+
+static struct static_vm *find_static_vm_paddr(phys_addr_t paddr,
+                        size_t size, unsigned int mtype)
+{
+        struct static_vm *svm;
+        struct vm_struct *vm;
+
+        list_for_each_entry(svm, &static_vmlist, list) {
+                vm = &svm->vm;
+                if (!(vm->flags & VM_ARM_STATIC_MAPPING))
+                        continue;
+                if ((vm->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype))
+                        continue;
+
+                if (vm->phys_addr > paddr ||
+                        paddr + size - 1 > vm->phys_addr + vm->size - 1)
+                        continue;
+
+                return svm;
+        }
+
+        return NULL;
+}
+
+struct static_vm *find_static_vm_vaddr(void *vaddr)
+{
+        struct static_vm *svm;
+        struct vm_struct *vm;
+
+        list_for_each_entry(svm, &static_vmlist, list) {
+                vm = &svm->vm;
+
+                /* static_vmlist is ascending order */
+                if (vm->addr > vaddr)
+                        break;
+
+                if (vm->addr <= vaddr && vm->addr + vm->size > vaddr)
+                        return svm;
+        }
+
+        return NULL;
+}
+
+void __init add_static_vm_early(struct static_vm *svm)
+{
+        struct static_vm *curr_svm;
+        struct vm_struct *vm;
+        void *vaddr;
+
+        vm = &svm->vm;
+        vm_area_add_early(vm);
+        vaddr = vm->addr;
+
+        list_for_each_entry(curr_svm, &static_vmlist, list) {
+                vm = &curr_svm->vm;
+
+                if (vm->addr > vaddr)
+                        break;
+        }
+        list_add_tail(&svm->list, &curr_svm->list);
+}
+
 int ioremap_page(unsigned long virt, unsigned long phys,
                  const struct mem_type *mtype)
 {
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index a8ee92da3544..d5a4e9ad8f0f 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -1,4 +1,6 @@
 #ifdef CONFIG_MMU
+#include <linux/list.h>
+#include <linux/vmalloc.h>
 
 /* the upper-most page table pointer */
 extern pmd_t *top_pmd;
@@ -65,6 +67,16 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
 /* consistent regions used by dma_alloc_attrs() */
 #define VM_ARM_DMA_CONSISTENT   0x20000000
 
+
+struct static_vm {
+        struct vm_struct vm;
+        struct list_head list;
+};
+
+extern struct list_head static_vmlist;
+extern struct static_vm *find_static_vm_vaddr(void *vaddr);
+extern __init void add_static_vm_early(struct static_vm *svm);
+
 #endif
 
 #ifdef CONFIG_ZONE_DMA