Merge branch kvm-arm64/ampere1-hafdbs-mitigation into kvmarm/next

* kvm-arm64/ampere1-hafdbs-mitigation:
  : AmpereOne erratum AC03_CPU_38 mitigation
  :
  : AmpereOne does not advertise support for FEAT_HAFDBS due to an
  : underlying erratum in the feature. The associated control bits do not
  : have RES0 behavior as required by the architecture.
  :
  : Introduce mitigations to prevent KVM from enabling the feature at
  : stage-2 as well as preventing KVM guests from enabling HAFDBS at
  : stage-1.
  KVM: arm64: Prevent guests from enabling HA/HD on Ampere1
  KVM: arm64: Refactor HFGxTR configuration into separate helpers
  arm64: errata: Mitigate Ampere1 erratum AC03_CPU_38 at stage-2

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/kvm/hyp/include/hyp/switch.h
Simple merge

diff --cc arch/arm64/kvm/hyp/pgtable.c
Simple merge

diff --cc arch/arm64/tools/cpucaps
Simple merge