riscv: Make __flush_tlb_range() loop over pte instead of flushing the whole tlb

[platform/kernel/linux-starfive.git] / mm / ioremap.c

diff --git a/mm/ioremap.c b/mm/ioremap.c
index 8652426..3e049df 100644 (file)
--- a/mm/ioremap.c
+++ b/mm/ioremap.c
@@ -10,14 +10,19 @@
 #include <linux/mm.h>
 #include <linux/io.h>
 #include <linux/export.h>
+#include <linux/ioremap.h>
 
-void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
-                          unsigned long prot)
+void __iomem *generic_ioremap_prot(phys_addr_t phys_addr, size_t size,
+                                  pgprot_t prot)
 {
        unsigned long offset, vaddr;
        phys_addr_t last_addr;
        struct vm_struct *area;
 
+       /* An early platform driver might end up here */
+       if (WARN_ON_ONCE(!slab_is_available()))
+               return NULL;
+
        /* Disallow wrap-around or zero size */
        last_addr = phys_addr + size - 1;
        if (!size || last_addr < phys_addr)
@@ -28,34 +33,42 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
        phys_addr -= offset;
        size = PAGE_ALIGN(size + offset);
 
-       if (!ioremap_allowed(phys_addr, size, prot))
-               return NULL;
-
-       area = get_vm_area_caller(size, VM_IOREMAP,
-                       __builtin_return_address(0));
+       area = __get_vm_area_caller(size, VM_IOREMAP, IOREMAP_START,
+                                   IOREMAP_END, __builtin_return_address(0));
        if (!area)
                return NULL;
        vaddr = (unsigned long)area->addr;
        area->phys_addr = phys_addr;
 
-       if (ioremap_page_range(vaddr, vaddr + size, phys_addr,
-                              __pgprot(prot))) {
+       if (ioremap_page_range(vaddr, vaddr + size, phys_addr, prot)) {
                free_vm_area(area);
                return NULL;
        }
 
        return (void __iomem *)(vaddr + offset);
 }
+
+#ifndef ioremap_prot
+void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,
+                          unsigned long prot)
+{
+       return generic_ioremap_prot(phys_addr, size, __pgprot(prot));
+}
 EXPORT_SYMBOL(ioremap_prot);
+#endif
 
-void iounmap(volatile void __iomem *addr)
+void generic_iounmap(volatile void __iomem *addr)
 {
        void *vaddr = (void *)((unsigned long)addr & PAGE_MASK);
 
-       if (!iounmap_allowed(vaddr))
-               return;
-
-       if (is_vmalloc_addr(vaddr))
+       if (is_ioremap_addr(vaddr))
                vunmap(vaddr);
 }
+
+#ifndef iounmap
+void iounmap(volatile void __iomem *addr)
+{
+       generic_iounmap(addr);
+}
 EXPORT_SYMBOL(iounmap);
+#endif