Merge branch 'for-next/kvm/errata' into for-next/core

KVM CPU errata rework
(Andrew Scull and Marc Zyngier)
* for-next/kvm/errata:
  KVM: arm64: Move __load_guest_stage2 to kvm_mmu.h
  arm64: Unify WORKAROUND_SPECULATIVE_AT_{NVHE,VHE}

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/cpucaps.h
index eacd0c7,dc70883..d7b3bb0
--- 1/arch/arm64/include/asm/cpucaps.h
--- 2/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -44,7 -44,7 +44,7 @@@
  #define ARM64_SSBS                            34
  #define ARM64_WORKAROUND_1418040              35
  #define ARM64_HAS_SB                          36
- #define ARM64_WORKAROUND_SPECULATIVE_AT_VHE   37
 -#define ARM64_WORKAROUND_SPECULATIVE_AT       37
++#define ARM64_WORKAROUND_SPECULATIVE_AT               37
  #define ARM64_HAS_ADDRESS_AUTH_ARCH           38
  #define ARM64_HAS_ADDRESS_AUTH_IMP_DEF                39
  #define ARM64_HAS_GENERIC_AUTH_ARCH           40
@@@ -55,15 -55,12 +55,14 @@@
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM   45
  #define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM  46
  #define ARM64_WORKAROUND_1542419              47
- #define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE  48
- #define ARM64_HAS_E0PD                                49
- #define ARM64_HAS_RNG                         50
- #define ARM64_HAS_AMU_EXTN                    51
- #define ARM64_HAS_ADDRESS_AUTH                        52
- #define ARM64_HAS_GENERIC_AUTH                        53
- #define ARM64_HAS_32BIT_EL1                   54
- #define ARM64_BTI                             55
+ #define ARM64_HAS_E0PD                                48
+ #define ARM64_HAS_RNG                         49
+ #define ARM64_HAS_AMU_EXTN                    50
+ #define ARM64_HAS_ADDRESS_AUTH                        51
+ #define ARM64_HAS_GENERIC_AUTH                        52
++#define ARM64_HAS_32BIT_EL1                   53
++#define ARM64_BTI                             54
  
- #define ARM64_NCAPS                           56
 -#define ARM64_NCAPS                           53
++#define ARM64_NCAPS                           55
  
  #endif /* __ASM_CPUCAPS_H */

diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge

diff --cc arch/arm64/include/asm/kvm_mmu.h
Simple merge

diff --cc arch/arm64/kernel/cpu_errata.c
index c8cb98a,95006a7..b0ce6bf
--- 1/arch/arm64/kernel/cpu_errata.c
--- 2/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@@ -897,11 -901,11 +901,11 @@@ const struct arm64_cpu_capabilities arm
                ERRATA_MIDR_RANGE_LIST(erratum_1418040_list),
        },
  #endif
- #ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT_VHE
+ #ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT
        {
-               .desc = "ARM errata 1165522 or 1530923",
-               .capability = ARM64_WORKAROUND_SPECULATIVE_AT_VHE,
-               ERRATA_MIDR_RANGE_LIST(erratum_speculative_at_vhe_list),
 -              .desc = "ARM errata 1165522, 1319367, 1530923",
++              .desc = "ARM errata 1165522, 1319367, or 1530923",
+               .capability = ARM64_WORKAROUND_SPECULATIVE_AT,
+               ERRATA_MIDR_RANGE_LIST(erratum_speculative_at_list),
        },
  #endif
  #ifdef CONFIG_ARM64_ERRATUM_1463225