KVM: arm64: Pass the walk_info structure to compute_par_s1()

Instead of just passing the translation regime, pass the full
walk_info structure to compute_par_s1(). This will help further
chamges that will require it.

Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/at.c b/arch/arm64/kvm/at.c
index bdb2c3e22f248e32d70bd9fa62a9206bdbd7025d..acf6a5d4977731fc5ef4c67d95067046173faac6 100644 (file)
--- a/arch/arm64/kvm/at.c
+++ b/arch/arm64/kvm/at.c
@@ -807,8 +807,8 @@ static u64 compute_par_s12(struct kvm_vcpu *vcpu, u64 s1_par,
        return par;
 }
 
-static u64 compute_par_s1(struct kvm_vcpu *vcpu, struct s1_walk_result *wr,
-                         enum trans_regime regime)
+static u64 compute_par_s1(struct kvm_vcpu *vcpu, struct s1_walk_info *wi,
+                         struct s1_walk_result *wr)
 {
        u64 par;
 
@@ -823,7 +823,7 @@ static u64 compute_par_s1(struct kvm_vcpu *vcpu, struct s1_walk_result *wr,
                par  = SYS_PAR_EL1_NSE;
                par |= wr->pa & GENMASK_ULL(47, 12);
 
-               if (regime == TR_EL10 &&
+               if (wi->regime == TR_EL10 &&
                    (__vcpu_sys_reg(vcpu, HCR_EL2) & HCR_DC)) {
                        par |= FIELD_PREP(SYS_PAR_EL1_ATTR,
                                          MEMATTR(WbRaWa, WbRaWa));
@@ -838,14 +838,14 @@ static u64 compute_par_s1(struct kvm_vcpu *vcpu, struct s1_walk_result *wr,
 
                par  = SYS_PAR_EL1_NSE;
 
-               mair = (regime == TR_EL10 ?
+               mair = (wi->regime == TR_EL10 ?
                        vcpu_read_sys_reg(vcpu, MAIR_EL1) :
                        vcpu_read_sys_reg(vcpu, MAIR_EL2));
 
                mair >>= FIELD_GET(PTE_ATTRINDX_MASK, wr->desc) * 8;
                mair &= 0xff;
 
-               sctlr = (regime == TR_EL10 ?
+               sctlr = (wi->regime == TR_EL10 ?
                         vcpu_read_sys_reg(vcpu, SCTLR_EL1) :
                         vcpu_read_sys_reg(vcpu, SCTLR_EL2));
 
@@ -1243,7 +1243,7 @@ static u64 handle_at_slow(struct kvm_vcpu *vcpu, u32 op, u64 vaddr)
                fail_s1_walk(&wr, ESR_ELx_FSC_PERM_L(wr.level), false);
 
 compute_par:
-       return compute_par_s1(vcpu, &wr, wi.regime);
+       return compute_par_s1(vcpu, &wi, &wr);
 }
 
 /*