Skip to content

Commit 651d61b

Browse files
shenkimpe
authored andcommitted
KVM: PPC: Fix documentation for ppc mmu caps
The documentation mentions KVM_CAP_PPC_RADIX_MMU, but the defines in the kvm headers spell it KVM_CAP_PPC_MMU_RADIX. Similarly with KVM_CAP_PPC_MMU_HASH_V3. Fixes: c927013 ("KVM: PPC: Book3S HV: Add userspace interfaces for POWER9 MMU") Signed-off-by: Joel Stanley <[email protected]> Acked-by: Paul Mackerras <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://msgid.link/[email protected]
1 parent a9c08bc commit 651d61b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Documentation/virt/kvm/api.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4300,7 +4300,7 @@ operating system that uses the PIT for timing (e.g. Linux 2.4.x).
43004300
4.100 KVM_PPC_CONFIGURE_V3_MMU
43014301
------------------------------
43024302

4303-
:Capability: KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3
4303+
:Capability: KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3
43044304
:Architectures: ppc
43054305
:Type: vm ioctl
43064306
:Parameters: struct kvm_ppc_mmuv3_cfg (in)
@@ -4334,7 +4334,7 @@ the Power ISA V3.00, Book III section 5.7.6.1.
43344334
4.101 KVM_PPC_GET_RMMU_INFO
43354335
---------------------------
43364336

4337-
:Capability: KVM_CAP_PPC_RADIX_MMU
4337+
:Capability: KVM_CAP_PPC_MMU_RADIX
43384338
:Architectures: ppc
43394339
:Type: vm ioctl
43404340
:Parameters: struct kvm_ppc_rmmu_info (out)
@@ -8095,7 +8095,7 @@ capability via KVM_ENABLE_CAP ioctl on the vcpu fd. Note that this
80958095
will disable the use of APIC hardware virtualization even if supported
80968096
by the CPU, as it's incompatible with SynIC auto-EOI behavior.
80978097

8098-
8.3 KVM_CAP_PPC_RADIX_MMU
8098+
8.3 KVM_CAP_PPC_MMU_RADIX
80998099
-------------------------
81008100

81018101
:Architectures: ppc
@@ -8105,7 +8105,7 @@ available, means that the kernel can support guests using the
81058105
radix MMU defined in Power ISA V3.00 (as implemented in the POWER9
81068106
processor).
81078107

8108-
8.4 KVM_CAP_PPC_HASH_MMU_V3
8108+
8.4 KVM_CAP_PPC_MMU_HASH_V3
81098109
---------------------------
81108110

81118111
:Architectures: ppc

include/uapi/linux/kvm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,9 +1221,9 @@ struct kvm_vfio_spapr_tce {
12211221
/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
12221222
#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
12231223
#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
1224-
/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */
1224+
/* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */
12251225
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
1226-
/* Available with KVM_CAP_PPC_RADIX_MMU */
1226+
/* Available with KVM_CAP_PPC_MMU_RADIX */
12271227
#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
12281228
/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
12291229
#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)

tools/include/uapi/linux/kvm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ struct kvm_s390_ucas_mapping {
15021502
/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
15031503
#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
15041504
#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
1505-
/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */
1505+
/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_MMU_HASH_V3 */
15061506
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
15071507
/* Available with KVM_CAP_PPC_RADIX_MMU */
15081508
#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)

0 commit comments

Comments
 (0)