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

Commit 0171356a authored by Russell King's avatar Russell King
Browse files

ARM: domains: move initial domain setting value to asm/domains.h 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8e798706

arch/arm/include/asm/domain.h

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ 
#define domain_mask(dom)	((3) << (2 * (dom)))

#define domain_val(dom,type)	((type) << (2 * (dom)))



#define DACR_INIT \

	(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \

	 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \

	 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \

	 domain_val(DOMAIN_IO, DOMAIN_CLIENT))



#ifndef __ASSEMBLY__



static inline unsigned int get_domain(void)

arch/arm/kernel/head.S

+1 −4
Original line number Diff line number Diff line
@@ -461,10 +461,7 @@ __enable_mmu: 
#ifdef CONFIG_ARM_LPAE

	mcrr	p15, 0, r4, r5, c2		@ load TTBR0

#else

	mov	r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \

		      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \

		      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \

		      domain_val(DOMAIN_IO, DOMAIN_CLIENT))

	mov	r5, #DACR_INIT

	mcr	p15, 0, r5, c3, c0, 0		@ load domain access register

	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer

#endif