Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae25a5b authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of... 

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable

Conflicts:
	arch/arm/mm/ioremap.c
parents 3ee0fc5c 497b7e94

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ endchoice 


config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on !ZBOOT_ROM

	depends on !ZBOOT_ROM && !ARM_LPAE

	help

	  Execute-In-Place allows the kernel to run from non-volatile storage

	  directly addressable by the CPU, such as NOR flash. This saves RAM

arch/arm/boot/compressed/head.S

+1 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ __armv7_mmu_cache_on: 
		mcrne	p15, 0, r3, c2, c0, 0	@ load page table pointer

		mcrne	p15, 0, r1, c3, c0, 0	@ load domain access control

#endif

		mcr	p15, 0, r0, c7, c5, 4	@ ISB

		mcr	p15, 0, r0, c1, c0, 0	@ load control register

		mrc	p15, 0, r0, c1, c0, 0	@ and read it back

		mov	r0, #0

arch/arm/include/asm/assembler.h

+11 −0
Original line number Diff line number Diff line
@@ -186,6 +186,17 @@ 
#define ALT_UP_B(label) b label

#endif



/*

 * Instruction barrier

 */

	.macro	instr_sync

#if __LINUX_ARM_ARCH__ >= 7

	isb

#elif __LINUX_ARM_ARCH__ == 6

	mcr	p15, 0, r0, c7, c5, 4

#endif

	.endm



/*

 * SMP data memory barrier

 */

arch/arm/include/asm/page.h

+4 −0
Original line number Diff line number Diff line
@@ -151,7 +151,11 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from, 
#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)

extern void copy_page(void *to, const void *from);



#ifdef CONFIG_ARM_LPAE

#include <asm/pgtable-3level-types.h>

#else

#include <asm/pgtable-2level-types.h>

#endif



#endif /* CONFIG_MMU */

arch/arm/include/asm/pgalloc.h

+25 −1
Original line number Diff line number Diff line
@@ -25,12 +25,34 @@ 
#define _PAGE_USER_TABLE	(PMD_TYPE_TABLE | PMD_BIT4 | PMD_DOMAIN(DOMAIN_USER))

#define _PAGE_KERNEL_TABLE	(PMD_TYPE_TABLE | PMD_BIT4 | PMD_DOMAIN(DOMAIN_KERNEL))



#ifdef CONFIG_ARM_LPAE



static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pmd_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);

}



static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)

{

	BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));

	free_page((unsigned long)pmd);

}



static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));

}



#else	/* !CONFIG_ARM_LPAE */



/*

 * Since we have only two-level page tables, these are trivial

 */

#define pmd_alloc_one(mm,addr)		({ BUG(); ((pmd_t *)2); })

#define pmd_free(mm, pmd)		do { } while (0)

#define pgd_populate(mm,pmd,pte)	BUG()

#define pud_populate(mm,pmd,pte)	BUG()



#endif	/* CONFIG_ARM_LPAE */



extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
@@ -109,7 +131,9 @@ static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte, 
{

	pmdval_t pmdval = (pte + PTE_HWTABLE_OFF) | prot;

	pmdp[0] = __pmd(pmdval);

#ifndef CONFIG_ARM_LPAE

	pmdp[1] = __pmd(pmdval + 256 * sizeof(pte_t));

#endif

	flush_pmd_entry(pmdp);

}