Skip to content

Commit bb032b2

Browse files
committed
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: Oliver Upton <[email protected]>
2 parents bc2e325 + 88a0a4f commit bb032b2

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -891,12 +891,12 @@ like this::
891891

892892
The irq_type field has the following values:
893893

894-
- irq_type[0]:
894+
- KVM_ARM_IRQ_TYPE_CPU:
895895
out-of-kernel GIC: irq_id 0 is IRQ, irq_id 1 is FIQ
896-
- irq_type[1]:
896+
- KVM_ARM_IRQ_TYPE_SPI:
897897
in-kernel GIC: SPI, irq_id between 32 and 1019 (incl.)
898898
(the vcpu_index field is ignored)
899-
- irq_type[2]:
899+
- KVM_ARM_IRQ_TYPE_PPI:
900900
in-kernel GIC: PPI, irq_id between 16 and 31 (incl.)
901901

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

19221922
If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier
19231923
for the device that wrote the MSI message. For PCI, this is usually a
1924-
BFD identifier in the lower 16 bits.
1924+
BDF identifier in the lower 16 bits.
19251925

19261926
On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS
19271927
feature of KVM_CAP_X2APIC_API capability is enabled. If it is enabled,
@@ -2986,7 +2986,7 @@ flags:
29862986

29872987
If KVM_MSI_VALID_DEVID is set, devid contains a unique device identifier
29882988
for the device that wrote the MSI message. For PCI, this is usually a
2989-
BFD identifier in the lower 16 bits.
2989+
BDF identifier in the lower 16 bits.
29902990

29912991
On x86, address_hi is ignored unless the KVM_X2APIC_API_USE_32BIT_IDS
29922992
feature of KVM_CAP_X2APIC_API capability is enabled. If it is enabled,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Groups:
3131
KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)
3232
Base address in the guest physical address space of the GIC virtual cpu
3333
interface register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.
34-
This address needs to be 4K aligned and the region covers 4 KByte.
34+
This address needs to be 4K aligned and the region covers 8 KByte.
3535

3636
Errors:
3737

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12078,6 +12078,8 @@ L: [email protected] (moderated for non-subscribers)
1207812078
1207912079
S: Maintained
1208012080
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
12081+
F: Documentation/virt/kvm/arm/
12082+
F: Documentation/virt/kvm/devices/arm*
1208112083
F: arch/arm64/include/asm/kvm*
1208212084
F: arch/arm64/include/uapi/asm/kvm*
1208312085
F: arch/arm64/kvm/

0 commit comments

Comments
 (0)