Commit 37468b30 authored by Po-Yu Chuang's avatar Po-Yu Chuang Committed by Russell King
Browse files

ARM: 7753/1: map_init_section flushes incorrect pmd 



This bug was introduced in commit e651eab0.
Some v4/v5 platforms failed to boot due to this.

Signed-off-by: default avatarPo-Yu Chuang <ratbert.chuang@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 69155794

arch/arm/mm/mmu.c

+5 −3
Original line number Diff line number Diff line
@@ -616,10 +616,12 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, 
	} while (pte++, addr += PAGE_SIZE, addr != end);

}



static void __init map_init_section(pmd_t *pmd, unsigned long addr,

static void __init __map_init_section(pmd_t *pmd, unsigned long addr,

			unsigned long end, phys_addr_t phys,

			const struct mem_type *type)

{

	pmd_t *p = pmd;



#ifndef CONFIG_ARM_LPAE

	/*

	 * In classic MMU format, puds and pmds are folded in to
@@ -638,7 +640,7 @@ static void __init map_init_section(pmd_t *pmd, unsigned long addr, 
		phys += SECTION_SIZE;

	} while (pmd++, addr += SECTION_SIZE, addr != end);



	flush_pmd_entry(pmd);

	flush_pmd_entry(p);

}



static void __init alloc_init_pmd(pud_t *pud, unsigned long addr,
@@ -661,7 +663,7 @@ static void __init alloc_init_pmd(pud_t *pud, unsigned long addr, 
		 */

		if (type->prot_sect &&

				((addr | next | phys) & ~SECTION_MASK) == 0) {

			map_init_section(pmd, addr, next, phys, type);

			__map_init_section(pmd, addr, next, phys, type);

		} else {

			alloc_init_pte(pmd, addr, next,

						__phys_to_pfn(phys), type);