[PATCH for-stable-5.10 0/2] Backport for- Work around firmware wrongly advertising GICv2 compatibility

Backport 2 patches that are required on ARM64 platforms having firmware wrongly advertising GICv2 compatibility.

Patch 1 has nvhe related conflict resolution while patch 2 is cleanly applied.

Tested on HiSilicon D06 platform.

Marc Zyngier (2): KVM: arm64: Rename __vgic_v3_get_ich_vtr_el2() to __vgic_v3_get_gic_config() KVM: arm64: Workaround firmware wrongly advertising GICv2-on-v3 compatibility

arch/arm64/include/asm/kvm_asm.h | 4 +-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 +-- arch/arm64/kvm/hyp/vgic-v3-sr.c | 40 ++++++++++++++++++++++++++++-- arch/arm64/kvm/vgic/vgic-v3.c | 12 ++++++--- 4 files changed, 51 insertions(+), 9 deletions(-)