powerpc/mm/32s: Use BATs for STRICT_KERNEL_RWX

[thirdparty/kernel/stable.git] / arch / powerpc / mm / pgtable_32.c

diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index d67215248d822677644a6a87a9dfb8d32a236188..6e56a6240bfa4da1ee1815bb01835c596fad5e1a 100644 (file)
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -43,17 +43,17 @@ EXPORT_SYMBOL(ioremap_bot); /* aka VMALLOC_END */
 
 extern char etext[], _stext[], _sinittext[], _einittext[];
 
-__ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
+__ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
 {
        if (!slab_is_available())
                return memblock_alloc(PTE_FRAG_SIZE, PTE_FRAG_SIZE);
 
-       return (pte_t *)pte_fragment_alloc(mm, address, 1);
+       return (pte_t *)pte_fragment_alloc(mm, 1);
 }
 
-pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
+pgtable_t pte_alloc_one(struct mm_struct *mm)
 {
-       return (pgtable_t)pte_fragment_alloc(mm, address, 0);
+       return (pgtable_t)pte_fragment_alloc(mm, 0);
 }
 
 void __iomem *
@@ -254,26 +254,20 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top)
 
 void __init mapin_ram(void)
 {
-       unsigned long s, top;
-
-#ifndef CONFIG_WII
-       top = total_lowmem;
-       s = mmu_mapin_ram(top);
-       __mapin_ram_chunk(s, top);
-#else
-       if (!wii_hole_size) {
-               s = mmu_mapin_ram(total_lowmem);
-               __mapin_ram_chunk(s, total_lowmem);
-       } else {
-               top = wii_hole_start;
-               s = mmu_mapin_ram(top);
-               __mapin_ram_chunk(s, top);
-
-               top = memblock_end_of_DRAM();
-               s = wii_mmu_mapin_mem2(top);
-               __mapin_ram_chunk(s, top);
+       struct memblock_region *reg;
+
+       for_each_memblock(memory, reg) {
+               phys_addr_t base = reg->base;
+               phys_addr_t top = min(base + reg->size, total_lowmem);
+
+               if (base >= top)
+                       continue;
+               base = mmu_mapin_ram(base, top);
+               if (IS_ENABLED(CONFIG_BDI_SWITCH))
+                       __mapin_ram_chunk(reg->base, top);
+               else
+                       __mapin_ram_chunk(base, top);
        }
-#endif
 }
 
 /* Scan the real Linux page tables and return a PTE pointer for
@@ -359,7 +353,10 @@ void mark_initmem_nx(void)
        unsigned long numpages = PFN_UP((unsigned long)_einittext) -
                                 PFN_DOWN((unsigned long)_sinittext);
 
-       change_page_attr(page, numpages, PAGE_KERNEL);
+       if (v_block_mapped((unsigned long)_stext) + 1)
+               mmu_mark_initmem_nx();
+       else
+               change_page_attr(page, numpages, PAGE_KERNEL);
 }
 
 #ifdef CONFIG_STRICT_KERNEL_RWX
@@ -368,6 +365,11 @@ void mark_rodata_ro(void)
        struct page *page;
        unsigned long numpages;
 
+       if (v_block_mapped((unsigned long)_sinittext)) {
+               mmu_mark_rodata_ro();
+               return;
+       }
+
        page = virt_to_page(_stext);
        numpages = PFN_UP((unsigned long)_etext) -
                   PFN_DOWN((unsigned long)_stext);