Skip to content

Commit

Permalink
target/arm: Add secure parameter to get_phys_addr_pmsav8
Browse files Browse the repository at this point in the history
Remove the use of regime_is_secure from get_phys_addr_pmsav8.
Since we already had a local variable named secure, use that.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220822152741.1617527-16-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
rth7680 authored and pm215 committed Sep 22, 2022
1 parent 71e73be commit be0ca94
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions target/arm/ptw.c
Original file line number Diff line number Diff line change
Expand Up @@ -1964,10 +1964,9 @@ void v8m_security_lookup(CPUARMState *env, uint32_t address,

static bool get_phys_addr_pmsav8(CPUARMState *env, uint32_t address,
MMUAccessType access_type, ARMMMUIdx mmu_idx,
GetPhysAddrResult *result,
bool secure, GetPhysAddrResult *result,
ARMMMUFaultInfo *fi)
{
uint32_t secure = regime_is_secure(env, mmu_idx);
V8M_SAttributes sattrs = {};
bool ret;

Expand Down Expand Up @@ -2415,7 +2414,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
if (arm_feature(env, ARM_FEATURE_V8)) {
/* PMSAv8 */
ret = get_phys_addr_pmsav8(env, address, access_type, mmu_idx,
result, fi);
is_secure, result, fi);
} else if (arm_feature(env, ARM_FEATURE_V7)) {
/* PMSAv7 */
ret = get_phys_addr_pmsav7(env, address, access_type, mmu_idx,
Expand Down

0 comments on commit be0ca94

Please sign in to comment.