ARM64: dts: rk3399: adjust box temperature patameters

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / mm / ioremap.c

diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c
index cf25fa9aa68f555e2f64a77386e225a797a8112d..01e88c8bcab0fd4aa96409fe751745141737cb39 100644 (file)
--- a/arch/arm64/mm/ioremap.c
+++ b/arch/arm64/mm/ioremap.c
@@ -62,6 +62,7 @@ static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size,
        if (!area)
                return NULL;
        addr = (unsigned long)area->addr;
+       area->phys_addr = phys_addr;
 
        err = ioremap_page_range(addr, addr + size, phys_addr, prot);
        if (err) {
@@ -81,9 +82,14 @@ EXPORT_SYMBOL(__ioremap);
 
 void __iounmap(volatile void __iomem *io_addr)
 {
-       void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
+       unsigned long addr = (unsigned long)io_addr & PAGE_MASK;
 
-       vunmap(addr);
+       /*
+        * We could get an address outside vmalloc range in case
+        * of ioremap_cache() reusing a RAM mapping.
+        */
+       if (VMALLOC_START <= addr && addr < VMALLOC_END)
+               vunmap((void *)addr);
 }
 EXPORT_SYMBOL(__iounmap);
 
@@ -98,93 +104,10 @@ void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size)
 }
 EXPORT_SYMBOL(ioremap_cache);
 
-static pte_t bm_pte[PTRS_PER_PTE] __page_aligned_bss;
-#ifndef CONFIG_ARM64_64K_PAGES
-static pte_t bm_pmd[PTRS_PER_PMD] __page_aligned_bss;
-#endif
-
-static inline pud_t * __init early_ioremap_pud(unsigned long addr)
-{
-       pgd_t *pgd;
-
-       pgd = pgd_offset_k(addr);
-       BUG_ON(pgd_none(*pgd) || pgd_bad(*pgd));
-
-       return pud_offset(pgd, addr);
-}
-
-static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
-{
-       pud_t *pud = early_ioremap_pud(addr);
-
-       BUG_ON(pud_none(*pud) || pud_bad(*pud));
-
-       return pmd_offset(pud, addr);
-}
-
-static inline pte_t * __init early_ioremap_pte(unsigned long addr)
-{
-       pmd_t *pmd = early_ioremap_pmd(addr);
-
-       BUG_ON(pmd_none(*pmd) || pmd_bad(*pmd));
-
-       return pte_offset_kernel(pmd, addr);
-}
-
+/*
+ * Must be called after early_fixmap_init
+ */
 void __init early_ioremap_init(void)
 {
-       pgd_t *pgd;
-       pud_t *pud;
-       pmd_t *pmd;
-       unsigned long addr = fix_to_virt(FIX_BTMAP_BEGIN);
-
-       pgd = pgd_offset_k(addr);
-       pud = pud_offset(pgd, addr);
-       pud_populate(&init_mm, pud, bm_pmd);
-       pmd = pmd_offset(pud, addr);
-       pmd_populate_kernel(&init_mm, pmd, bm_pte);
-
-       /*
-        * The boot-ioremap range spans multiple pmds, for which
-        * we are not prepared:
-        */
-       BUILD_BUG_ON((__fix_to_virt(FIX_BTMAP_BEGIN) >> PMD_SHIFT)
-                    != (__fix_to_virt(FIX_BTMAP_END) >> PMD_SHIFT));
-
-       if (pmd != early_ioremap_pmd(fix_to_virt(FIX_BTMAP_END))) {
-               WARN_ON(1);
-               pr_warn("pmd %p != %p\n",
-                       pmd, early_ioremap_pmd(fix_to_virt(FIX_BTMAP_END)));
-               pr_warn("fix_to_virt(FIX_BTMAP_BEGIN): %08lx\n",
-                       fix_to_virt(FIX_BTMAP_BEGIN));
-               pr_warn("fix_to_virt(FIX_BTMAP_END):   %08lx\n",
-                       fix_to_virt(FIX_BTMAP_END));
-
-               pr_warn("FIX_BTMAP_END:       %d\n", FIX_BTMAP_END);
-               pr_warn("FIX_BTMAP_BEGIN:     %d\n",
-                       FIX_BTMAP_BEGIN);
-       }
-
        early_ioremap_setup();
 }
-
-void __init __early_set_fixmap(enum fixed_addresses idx,
-                              phys_addr_t phys, pgprot_t flags)
-{
-       unsigned long addr = __fix_to_virt(idx);
-       pte_t *pte;
-
-       if (idx >= __end_of_fixed_addresses) {
-               BUG();
-               return;
-       }
-
-       pte = early_ioremap_pte(addr);
-
-       if (pgprot_val(flags))
-               set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags));
-       else {
-               pte_clear(&init_mm, addr, pte);
-               flush_tlb_kernel_range(addr, addr+PAGE_SIZE);
-       }
-}