diff options
| -rw-r--r-- | arch/arm/cpu/mmu.h | 9 | ||||
| -rw-r--r-- | arch/arm/cpu/sm.c | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/cpu/mmu.h b/arch/arm/cpu/mmu.h index 6e7a4c0350..c85e0ea050 100644 --- a/arch/arm/cpu/mmu.h +++ b/arch/arm/cpu/mmu.h @@ -39,6 +39,15 @@ static inline void set_ttbr(void *ttb) #define DOMAIN_CLIENT 1 #define DOMAIN_MANAGER 3 +static inline unsigned long get_domain(void) +{ + unsigned long dacr; + + asm volatile ("mrc p15, 0, %0, c3, c0, 0" : "=r"(dacr)); + + return dacr; +} + static inline void set_domain(unsigned val) { /* Set the Domain Access Control Register */ diff --git a/arch/arm/cpu/sm.c b/arch/arm/cpu/sm.c index 1f2c236d5a..cb33d96250 100644 --- a/arch/arm/cpu/sm.c +++ b/arch/arm/cpu/sm.c @@ -150,7 +150,7 @@ static bool armv7_have_security_extensions(void) int armv7_secure_monitor_install(void) { int mmuon; - unsigned long ttb, vbar; + unsigned long ttb, vbar, dacr; if (!armv7_have_security_extensions()) { pr_err("Security extensions not implemented.\n"); @@ -164,12 +164,14 @@ int armv7_secure_monitor_install(void) vbar = get_vbar(); ttb = get_ttbr(); + dacr = get_domain(); armv7_init_nonsec(); __armv7_secure_monitor_install(); set_ttbr((void *)ttb); set_vbar(vbar); + set_domain(dacr); if (mmuon) { /* |