Merge branch 'kvm-arm64/vgic-v4-ctl' into kvmarm/next

* kvm-arm64/vgic-v4-ctl:
  : Userspace control of nASSGIcap, courtesy of Raghavendra Rao Ananta
  :
  : Allow userspace to decide if support for SGIs without an active state is
  : advertised to the guest, allowing VMs from GICv3-only hardware to be
  : migrated to to GICv4.1 capable machines.
  Documentation: KVM: arm64: Describe VGICv3 registers writable pre-init
  KVM: arm64: selftests: Add test for nASSGIcap attribute
  KVM: arm64: vgic-v3: Allow userspace to write GICD_TYPER2.nASSGIcap
  KVM: arm64: vgic-v3: Allow access to GICD_IIDR prior to initialization
  KVM: arm64: vgic-v3: Consolidate MAINT_IRQ handling
  KVM: arm64: Disambiguate support for vSGIs v. vLPIs

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

diff --cc Documentation/virt/kvm/devices/arm-vgic-v3.rst
Simple merge

diff --cc arch/arm64/kvm/vgic/vgic-init.c
Simple merge

diff --cc arch/arm64/kvm/vgic/vgic.h
Simple merge

diff --cc include/kvm/arm_vgic.h
Simple merge

diff --cc tools/testing/selftests/kvm/arm64/vgic_init.c
index 7d508dcdbf23d2ffe7b0188b738d1a62775b6f1c,743351aa998ed2eebaf4dcc79f6828ce7bfd3386..a8e0f46bc0abb15f76d7f850fde1e5f49b2b9b7e
--- 1/tools/testing/selftests/kvm/arm64/vgic_init.c
--- 2/tools/testing/selftests/kvm/arm64/vgic_init.c
+++ b/tools/testing/selftests/kvm/arm64/vgic_init.c
@@@ -944,7 -767,7 +983,8 @@@ void run_tests(uint32_t gic_dev_type
                test_v3_last_bit_single_rdist();
                test_v3_redist_ipa_range_check_at_vcpu_run();
                test_v3_its_region();
 +              test_v3_sysregs();
+               test_v3_nassgicap();
        }
  }