Commit 3fbb96c0 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm: Remove HYP/Stage-2 page-table support 



Remove all traces of Stage-2 and HYP page table support.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
parent 541ad015

arch/arm/include/asm/pgtable-3level.h

+0 −20
Original line number Diff line number Diff line
@@ -104,26 +104,6 @@ 
 */

#define L_PGD_SWAPPER		(_AT(pgdval_t, 1) << 55)	/* swapper_pg_dir entry */



/*

 * 2nd stage PTE definitions for LPAE.

 */

#define L_PTE_S2_MT_UNCACHED		(_AT(pteval_t, 0x0) << 2) /* strongly ordered */

#define L_PTE_S2_MT_WRITETHROUGH	(_AT(pteval_t, 0xa) << 2) /* normal inner write-through */

#define L_PTE_S2_MT_WRITEBACK		(_AT(pteval_t, 0xf) << 2) /* normal inner write-back */

#define L_PTE_S2_MT_DEV_SHARED		(_AT(pteval_t, 0x1) << 2) /* device */

#define L_PTE_S2_MT_MASK		(_AT(pteval_t, 0xf) << 2)



#define L_PTE_S2_RDONLY			(_AT(pteval_t, 1) << 6)   /* HAP[1]   */

#define L_PTE_S2_RDWR			(_AT(pteval_t, 3) << 6)   /* HAP[2:1] */



#define L_PMD_S2_RDONLY			(_AT(pmdval_t, 1) << 6)   /* HAP[1]   */

#define L_PMD_S2_RDWR			(_AT(pmdval_t, 3) << 6)   /* HAP[2:1] */



/*

 * Hyp-mode PL2 PTE definitions for LPAE.

 */

#define L_PTE_HYP		L_PTE_USER



#ifndef __ASSEMBLY__



#define pud_none(pud)		(!pud_val(pud))

arch/arm/include/asm/pgtable.h

+0 −9
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ extern void __pgd_error(const char *file, int line, pgd_t); 


extern pgprot_t		pgprot_user;

extern pgprot_t		pgprot_kernel;

extern pgprot_t		pgprot_hyp_device;

extern pgprot_t		pgprot_s2;

extern pgprot_t		pgprot_s2_device;



#define _MOD_PROT(p, b)	__pgprot(pgprot_val(p) | (b))
@@ -95,12 +92,6 @@ extern pgprot_t pgprot_s2_device; 
#define PAGE_READONLY_EXEC	_MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_RDONLY)

#define PAGE_KERNEL		_MOD_PROT(pgprot_kernel, L_PTE_XN)

#define PAGE_KERNEL_EXEC	pgprot_kernel

#define PAGE_HYP		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_XN)

#define PAGE_HYP_EXEC		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY)

#define PAGE_HYP_RO		_MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY | L_PTE_XN)

#define PAGE_HYP_DEVICE		_MOD_PROT(pgprot_hyp_device, L_PTE_HYP)

#define PAGE_S2			_MOD_PROT(pgprot_s2, L_PTE_S2_RDONLY | L_PTE_XN)

#define PAGE_S2_DEVICE		_MOD_PROT(pgprot_s2_device, L_PTE_S2_RDONLY | L_PTE_XN)



#define __PAGE_NONE		__pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN | L_PTE_NONE)

#define __PAGE_SHARED		__pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_XN)

arch/arm/include/asm/sections.h

+1 −5
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ extern char __idmap_text_start[]; 
extern char __idmap_text_end[];

extern char __entry_text_start[];

extern char __entry_text_end[];

extern char __hyp_idmap_text_start[];

extern char __hyp_idmap_text_end[];



static inline bool in_entry_text(unsigned long addr)

{
@@ -22,9 +20,7 @@ static inline bool in_entry_text(unsigned long addr) 
static inline bool in_idmap_text(unsigned long addr)

{

	void *a = (void *)addr;

	return memory_contains(__idmap_text_start, __idmap_text_end, a, 1) ||

	       memory_contains(__hyp_idmap_text_start, __hyp_idmap_text_end,

			       a, 1);

	return memory_contains(__idmap_text_start, __idmap_text_end, a, 1);

}



#endif	/* _ASM_ARM_SECTIONS_H */

arch/arm/include/asm/virt.h

+0 −7
Original line number Diff line number Diff line
@@ -67,13 +67,6 @@ static inline bool is_kernel_in_hyp_mode(void) 
	return false;

}



/* The section containing the hypervisor idmap text */

extern char __hyp_idmap_text_start[];

extern char __hyp_idmap_text_end[];



/* The section containing the hypervisor text */

extern char __hyp_text_start[];

extern char __hyp_text_end[];

#endif



#else

arch/arm/kernel/vmlinux-xip.lds.S

+0 −8
Original line number Diff line number Diff line
@@ -162,14 +162,6 @@ SECTIONS 
ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")

ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")



/*

 * The HYP init code can't be more than a page long,

 * and should not cross a page boundary.

 * The above comment applies as well.

 */

ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE,

	"HYP init code too big or misaligned")



#ifdef CONFIG_XIP_DEFLATED_DATA

/*

 * The .bss is used as a stack area for __inflate_kernel_data() whose stack

CRA Git | Maintained and supported by SUSTech CRA and CCSE