KVM: arm64: nv: Rename vtcr_to_walk_info() to setup_s2_walk()

This rename aligns the stage-2 walker better with the stage-1 walker.
Also set up other non-VTCR walk info in the function.

Signed-off-by: Wei-Lin Chang <weilin.chang@arm.com>
Link: https://patch.msgid.link/20260414000334.3947257-2-weilin.chang@arm.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 883b6c1008fbb96a43f3d62c983f5c5293a6e800..00e8bc939baf4178d7b12900ee67e6229334457e 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -378,9 +378,12 @@ static int walk_nested_s2_pgd(struct kvm_vcpu *vcpu, phys_addr_t ipa,
        return 0;
 }
 
-static void vtcr_to_walk_info(u64 vtcr, struct s2_walk_info *wi)
+static void setup_s2_walk(struct kvm_vcpu *vcpu, struct s2_walk_info *wi)
 {
-       wi->t0sz = vtcr & TCR_EL2_T0SZ_MASK;
+       u64 vtcr = vcpu_read_sys_reg(vcpu, VTCR_EL2);
+
+       wi->baddr = vcpu_read_sys_reg(vcpu, VTTBR_EL2);
+       wi->t0sz = vtcr & VTCR_EL2_T0SZ_MASK;
 
        switch (FIELD_GET(VTCR_EL2_TG0_MASK, vtcr)) {
        case VTCR_EL2_TG0_4K:
@@ -398,12 +401,12 @@ static void vtcr_to_walk_info(u64 vtcr, struct s2_walk_info *wi)
                              ps_to_output_size(FIELD_GET(VTCR_EL2_PS_MASK, vtcr), false));
 
        wi->ha = vtcr & VTCR_EL2_HA;
+       wi->be = vcpu_read_sys_reg(vcpu, SCTLR_EL2) & SCTLR_ELx_EE;
 }
 
 int kvm_walk_nested_s2(struct kvm_vcpu *vcpu, phys_addr_t gipa,
                       struct kvm_s2_trans *result)
 {
-       u64 vtcr = vcpu_read_sys_reg(vcpu, VTCR_EL2);
        struct s2_walk_info wi;
        int ret;
 
@@ -412,11 +415,7 @@ int kvm_walk_nested_s2(struct kvm_vcpu *vcpu, phys_addr_t gipa,
        if (!vcpu_has_nv(vcpu))
                return 0;
 
-       wi.baddr = vcpu_read_sys_reg(vcpu, VTTBR_EL2);
-
-       vtcr_to_walk_info(vtcr, &wi);
-
-       wi.be = vcpu_read_sys_reg(vcpu, SCTLR_EL2) & SCTLR_ELx_EE;
+       setup_s2_walk(vcpu, &wi);
 
        ret = walk_nested_s2_pgd(vcpu, gipa, &wi, result);
        if (ret)