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

KVM/arm64 fixes for 6.2, take #1

- Fix the PMCR_EL0 reset value after the PMU rework

- Correctly handle S2 fault triggered by a S1 page table walk
  by not always classifying it as a write, as this breaks on
  R/O memslots

- Document why we cannot exit with KVM_EXIT_MMIO when taking
  a write fault from a S1 PTW on a R/O memslot

- Put the Apple M2 on the naughty step for not being able to
  correctly implement the vgic SEIS feature, just liek the M1
  before it

- Reviewer updates: Alex is stepping down, replaced by Zenghui

diff --combined Documentation/virt/kvm/api.rst
index d8ea37dfddf4263895dd43601588825242e576d9,dbed78a9c31b06294901d324f1b471d8362eae0c..9807b05a1b57109f1051ac5fb24823cdf13fed12
--- 1/Documentation/virt/kvm/api.rst
--- 2/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@@ -1354,6 -1354,14 +1354,14 @@@ the memory region are automatically ref
  mmap() that affects the region will be made visible immediately.  Another
  example is madvise(MADV_DROP).
  
+ Note: On arm64, a write generated by the page-table walker (to update
+ the Access and Dirty flags, for example) never results in a
+ KVM_EXIT_MMIO exit when the slot has the KVM_MEM_READONLY flag. This
+ is because KVM cannot provide the data that would be written by the
+ page-table walker, making it impossible to emulate the access.
+ Instead, an abort (data abort if the cause of the page-table update
+ was a load or a store, instruction abort if it was an instruction
+ fetch) is injected in the guest.
  
  4.36 KVM_SET_TSS_ADDR
  ---------------------
@@@ -8310,20 -8318,6 +8318,20 @@@ CPU[EAX=1]:ECX[24] (TSC_DEADLINE) is no
  It can be enabled if ``KVM_CAP_TSC_DEADLINE_TIMER`` is present and the kernel
  has enabled in-kernel emulation of the local APIC.
  
 +CPU topology
 +~~~~~~~~~~~~
 +
 +Several CPUID values include topology information for the host CPU:
 +0x0b and 0x1f for Intel systems, 0x8000001e for AMD systems.  Different
 +versions of KVM return different values for this information and userspace
 +should not rely on it.  Currently they return all zeroes.
 +
 +If userspace wishes to set up a guest topology, it should be careful that
 +the values of these three leaves differ for each CPU.  In particular,
 +the APIC ID is found in EDX for all subleaves of 0x0b and 0x1f, and in EAX
 +for 0x8000001e; the latter also encodes the core id and node id in bits
 +7:0 of EBX and ECX respectively.
 +
  Obsolete ioctls and capabilities
  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  

diff --combined MAINTAINERS
index a36df9ed283d394e70c83a5acba9a12527bf4bde,bb4b19eaa33bb7ea919b6018c36c6f23e7680b43..47dedaa5e39367afcf47e9d81d2e663a91ef20cb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11356,9 -11356,9 +11356,9 @@@ F:   virt/kvm/
  KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
  M:    Marc Zyngier <[email protected]>
  R:    James Morse <[email protected]>
- R:    Alexandru Elisei <[email protected]>
  R:    Suzuki K Poulose <[email protected]>
  R:    Oliver Upton <[email protected]>
+ R:    Zenghui Yu <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  L:    [email protected] (deprecated, moderated for non-subscribers)
@@@ -16610,13 -16610,6 +16610,13 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml
  F:    drivers/input/keyboard/pinephone-keyboard.c
  
 +PKTCDVD DRIVER
 +M:    [email protected]
 +S:    Orphan
 +F:    drivers/block/pktcdvd.c
 +F:    include/linux/pktcdvd.h
 +F:    include/uapi/linux/pktcdvd.h
 +
  PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER
  M:    Tomasz Duszynski <[email protected]>
  S:    Maintained
@@@ -22253,9 -22246,7 +22253,9 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Vivek Thampi <[email protected]>
 +M:    Srivatsa S. Bhat (VMware) <[email protected]>
 +M:    Deep Shah <[email protected]>
 +R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
  L:    [email protected]
  S:    Supported