Skip to content

Commit 6c23aa7

Browse files
ref(priv): remove as->type to priv function
Signed-off-by: Miguel Silva <[email protected]>
1 parent 5c5a759 commit 6c23aa7

File tree

1 file changed

+3
-15
lines changed
  • src/arch/armv8/armv8-r

1 file changed

+3
-15
lines changed

src/arch/armv8/armv8-r/mpu.c

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,6 @@
99
#include <arch/sysregs.h>
1010
#include <arch/fences.h>
1111

12-
static priv_t mpu_as_priv(struct addr_space* as)
13-
{
14-
priv_t priv;
15-
16-
if (as->type == AS_VM) {
17-
priv = PRIV_VM;
18-
} else {
19-
priv = PRIV_HYP;
20-
}
21-
22-
return priv;
23-
}
24-
2512
static unsigned long mpu_get_region_base(mpid_t mpid)
2613
{
2714
unsigned long prbar = 0;
@@ -111,7 +98,6 @@ static bool mpu_entry_clear(mpid_t mpid)
11198
bool mpu_map(struct addr_space* as, struct mp_region* mpr, bool locked)
11299
{
113100
mpid_t mpid = INVALID_MPID;
114-
priv_t priv = mpu_as_priv(as);
115101

116102
if (mpr->size == 0) {
117103
return false;
@@ -130,8 +116,10 @@ bool mpu_map(struct addr_space* as, struct mp_region* mpr, bool locked)
130116
mpu_entry_lock(mpid);
131117
}
132118
bitmap_set((bitmap_t*)&as->arch.mpu_entry_mask, mpid);
133-
if (priv == PRIV_VM) {
119+
if (as->type == AS_VM) {
134120
mpr->mem_flags.prlar &= (uint16_t)~PRLAR_EN;
121+
} else if (as->type == AS_HYP || as->type == AS_HYP_CPY) {
122+
mpr->mem_flags.prlar |= (uint16_t)PRLAR_EN;
135123
}
136124
mpu_entry_set(mpid, mpr);
137125
}

0 commit comments

Comments
 (0)