| Message ID | 20250410210022.809905-2-pierrick.bouvier@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] target/arm/ptw: extract arm_mmu_idx_to_security_space | expand |
On 10/4/25 23:00, Pierrick Bouvier wrote: > We'll reuse this function later. > > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > --- > target/arm/ptw.c | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/target/arm/ptw.c b/target/arm/ptw.c > index 8d4e9e07a94..5e196cfa955 100644 > --- a/target/arm/ptw.c > +++ b/target/arm/ptw.c > @@ -3550,13 +3550,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, > memop, result, fi); > } > > -bool get_phys_addr(CPUARMState *env, vaddr address, > - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, > - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) > +static ARMSecuritySpace arm_mmu_idx_to_security_space > +(CPUARMState *env, ARMMMUIdx mmu_idx) Style is: static ARMSecuritySpace arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) or: static ARMSecuritySpace arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 4/11/25 06:44, Philippe Mathieu-Daudé wrote: > On 10/4/25 23:00, Pierrick Bouvier wrote: >> We'll reuse this function later. >> >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> --- >> target/arm/ptw.c | 21 ++++++++++++++------- >> 1 file changed, 14 insertions(+), 7 deletions(-) >> >> diff --git a/target/arm/ptw.c b/target/arm/ptw.c >> index 8d4e9e07a94..5e196cfa955 100644 >> --- a/target/arm/ptw.c >> +++ b/target/arm/ptw.c >> @@ -3550,13 +3550,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, >> memop, result, fi); >> } >> >> -bool get_phys_addr(CPUARMState *env, vaddr address, >> - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, >> - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) >> +static ARMSecuritySpace arm_mmu_idx_to_security_space >> +(CPUARMState *env, ARMMMUIdx mmu_idx) > > Style is: > > static ARMSecuritySpace arm_mmu_idx_to_security_space(CPUARMState *env, > ARMMMUIdx mmu_idx) > > or: > > static ARMSecuritySpace > arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) > Thanks, I'll update to this one. > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> >
diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8d4e9e07a94..5e196cfa955 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3550,13 +3550,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, memop, result, fi); } -bool get_phys_addr(CPUARMState *env, vaddr address, - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +static ARMSecuritySpace arm_mmu_idx_to_security_space +(CPUARMState *env, ARMMMUIdx mmu_idx) { - S1Translate ptw = { - .in_mmu_idx = mmu_idx, - }; ARMSecuritySpace ss; switch (mmu_idx) { @@ -3617,7 +3613,18 @@ bool get_phys_addr(CPUARMState *env, vaddr address, g_assert_not_reached(); } - ptw.in_space = ss; + return ss; +} + +bool get_phys_addr(CPUARMState *env, vaddr address, + MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +{ + S1Translate ptw = { + .in_mmu_idx = mmu_idx, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), + }; + return get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); }
We'll reuse this function later. Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> --- target/arm/ptw.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)