arm64: kvm: Replace hardcoded '1' with SYS_PAR_EL1_F
authorWill Deacon <will@kernel.org>
Thu, 22 Aug 2019 16:21:21 +0000 (17:21 +0100)
committerWill Deacon <will@kernel.org>
Tue, 27 Aug 2019 16:38:41 +0000 (17:38 +0100)
Now that we have a definition for the 'F' field of PAR_EL1, use that
instead of coding the immediate directly.

Acked-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kvm/hyp/switch.c

index adaf266..bd978ad 100644 (file)
@@ -264,7 +264,7 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
        tmp = read_sysreg(par_el1);
        write_sysreg(par, par_el1);
 
-       if (unlikely(tmp & 1))
+       if (unlikely(tmp & SYS_PAR_EL1_F))
                return false; /* Translation failed, back to guest */
 
        /* Convert PAR to HPFAR format */