Merge tag 'kvmarm-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmar...

KVM/arm fixes for 5.4, take #1

- Remove the now obsolete hyp_alternate_select construct
- Fix the TRACE_INCLUDE_PATH macro in the vgic code

diff --combined arch/arm64/kvm/hyp/switch.c
index bd978ad71936dc7413c0d077f7d6c18cdc8f48ac,a15baca9aca08f742fdf8784121c74f37d5f018c..3d3815020e3627488dbcf4de139ddf1709399178
--- 1/arch/arm64/kvm/hyp/switch.c
--- 2/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@@ -229,20 -229,6 +229,6 @@@ static void __hyp_text __hyp_vgic_resto
        }
  }
  
- static bool __hyp_text __true_value(void)
- {
-       return true;
- }
- 
- static bool __hyp_text __false_value(void)
- {
-       return false;
- }
- 
- static hyp_alternate_select(__check_arm_834220,
-                           __false_value, __true_value,
-                           ARM64_WORKAROUND_834220);
- 
  static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
  {
        u64 par, tmp;
@@@ -264,7 -250,7 +250,7 @@@
        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 */
@@@ -298,7 -284,8 +284,8 @@@ static bool __hyp_text __populate_fault
         * resolve the IPA using the AT instruction.
         */
        if (!(esr & ESR_ELx_S1PTW) &&
-           (__check_arm_834220()() || (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {
+           (cpus_have_const_cap(ARM64_WORKAROUND_834220) ||
+            (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {
                if (!__translate_far_to_hpfar(far, &hpfar))
                        return false;
        } else {