Commit bb032b23 authored by Oliver Upton's avatar Oliver Upton
Browse files

Merge branch kvm-arm64/docs into kvmarm/next 



* kvm-arm64/docs:
  : KVM Documentation fixes, courtesy of Changyuan Lyu
  :
  : Small set of typo fixes / corrections to the KVM API documentation
  : relating to MSIs and arm64 VGIC UAPI.
  MAINTAINERS: Include documentation in KVM/arm64 entry
  KVM: Documentation: Correct the VGIC V2 CPU interface addr space size
  KVM: Documentation: Enumerate allowed value macros of `irq_type`
  KVM: Documentation: Fix typo `BFD`

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parents bc2e3253 88a0a4f6

Documentation/virt/kvm/api.rst

+5 −5
Original line number Diff line number Diff line
@@ -891,12 +891,12 @@ like this:: 


The irq_type field has the following values:



- irq_type[0]:

- KVM_ARM_IRQ_TYPE_CPU:

	       out-of-kernel GIC: irq_id 0 is IRQ, irq_id 1 is FIQ

- irq_type[1]:

- KVM_ARM_IRQ_TYPE_SPI:

	       in-kernel GIC: SPI, irq_id between 32 and 1019 (incl.)

               (the vcpu_index field is ignored)

- irq_type[2]:

- KVM_ARM_IRQ_TYPE_PPI:

	       in-kernel GIC: PPI, irq_id between 16 and 31 (incl.)



(The irq_id field thus corresponds nicely to the IRQ ID in the ARM GIC specs)
@@ -1921,7 +1921,7 @@ flags: 


If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier

for the device that wrote the MSI message.  For PCI, this is usually a

BFD identifier in the lower 16 bits.

BDF identifier in the lower 16 bits.



On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS

feature of KVM_CAP_X2APIC_API capability is enabled.  If it is enabled,
@@ -2986,7 +2986,7 @@ flags: 


If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier

for the device that wrote the MSI message.  For PCI, this is usually a

BFD identifier in the lower 16 bits.

BDF identifier in the lower 16 bits.



On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS

feature of KVM_CAP_X2APIC_API capability is enabled.  If it is enabled,

Documentation/virt/kvm/devices/arm-vgic.rst

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Groups: 
    KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)

      Base address in the guest physical address space of the GIC virtual cpu

      interface register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.

      This address needs to be 4K aligned and the region covers 4 KByte.

      This address needs to be 4K aligned and the region covers 8 KByte.



  Errors:

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -12078,6 +12078,8 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	kvmarm@lists.linux.dev

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

F:	Documentation/virt/kvm/arm/

F:	Documentation/virt/kvm/devices/arm*

F:	arch/arm64/include/asm/kvm*

F:	arch/arm64/include/uapi/asm/kvm*

F:	arch/arm64/kvm/