Skip to content

Commit 4a09ddb

Browse files
committed
Merge branch kvm-arm64/kerneldoc into kvmarm/next
* kvm-arm64/kerneldoc: : kerneldoc warning fixes, courtesy of Randy Dunlap : : Fixes addressing the widespread misuse of kerneldoc-style comments : throughout KVM/arm64. KVM: arm64: vgic: fix a kernel-doc warning KVM: arm64: vgic-its: fix kernel-doc warnings KVM: arm64: vgic-init: fix a kernel-doc warning KVM: arm64: sys_regs: fix kernel-doc warnings KVM: arm64: PMU: fix kernel-doc warnings KVM: arm64: mmu: fix a kernel-doc warning KVM: arm64: vhe: fix a kernel-doc warning KVM: arm64: hyp/aarch32: fix kernel-doc warnings KVM: arm64: guest: fix kernel-doc warnings KVM: arm64: debug: fix kernel-doc warnings Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
2 parents 9bd8d7d + e634ff9 commit 4a09ddb

File tree

10 files changed

+24
-15
lines changed

10 files changed

+24
-15
lines changed

arch/arm64/kvm/debug.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
static DEFINE_PER_CPU(u64, mdcr_el2);
2525

26-
/**
26+
/*
2727
* save/restore_guest_debug_regs
2828
*
2929
* For some debug operations we need to tweak some guest registers. As
@@ -143,6 +143,7 @@ void kvm_arm_vcpu_init_debug(struct kvm_vcpu *vcpu)
143143

144144
/**
145145
* kvm_arm_reset_debug_ptr - reset the debug ptr to point to the vcpu state
146+
* @vcpu: the vcpu pointer
146147
*/
147148

148149
void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)

arch/arm64/kvm/guest.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ static int copy_sve_reg_indices(const struct kvm_vcpu *vcpu,
711711

712712
/**
713713
* kvm_arm_num_regs - how many registers do we present via KVM_GET_ONE_REG
714+
* @vcpu: the vCPU pointer
714715
*
715716
* This is for all registers.
716717
*/
@@ -729,6 +730,8 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
729730

730731
/**
731732
* kvm_arm_copy_reg_indices - get indices of all registers.
733+
* @vcpu: the vCPU pointer
734+
* @uindices: register list to copy
732735
*
733736
* We do core registers right here, then we append system regs.
734737
*/
@@ -902,8 +905,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
902905

903906
/**
904907
* kvm_arch_vcpu_ioctl_set_guest_debug - set up guest debugging
905-
* @kvm: pointer to the KVM struct
906-
* @kvm_guest_debug: the ioctl data buffer
908+
* @vcpu: the vCPU pointer
909+
* @dbg: the ioctl data buffer
907910
*
908911
* This sets up and enables the VM for guest debugging. Userspace
909912
* passes in a control flag to enable different debug types and

arch/arm64/kvm/hyp/aarch32.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu)
8484
}
8585

8686
/**
87-
* adjust_itstate - adjust ITSTATE when emulating instructions in IT-block
87+
* kvm_adjust_itstate - adjust ITSTATE when emulating instructions in IT-block
8888
* @vcpu: The VCPU pointer
8989
*
9090
* When exceptions occur while instructions are executed in Thumb IF-THEN
@@ -120,7 +120,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu)
120120
}
121121

122122
/**
123-
* kvm_skip_instr - skip a trapped instruction and proceed to the next
123+
* kvm_skip_instr32 - skip a trapped instruction and proceed to the next
124124
* @vcpu: The vcpu pointer
125125
*/
126126
void kvm_skip_instr32(struct kvm_vcpu *vcpu)

arch/arm64/kvm/hyp/vhe/sysreg-sr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu)
9595
}
9696

9797
/**
98-
* __vcpu_put_switch_syregs - Restore host system registers to the physical CPU
98+
* __vcpu_put_switch_sysregs - Restore host system registers to the physical CPU
9999
*
100100
* @vcpu: The VCPU pointer
101101
*

arch/arm64/kvm/mmu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ static void invalidate_icache_guest_page(void *va, size_t size)
305305
* does.
306306
*/
307307
/**
308-
* unmap_stage2_range -- Clear stage2 page table entries to unmap a range
308+
* __unmap_stage2_range -- Clear stage2 page table entries to unmap a range
309309
* @mmu: The KVM stage-2 MMU pointer
310310
* @start: The intermediate physical base address of the range to unmap
311311
* @size: The size of the area to unmap

arch/arm64/kvm/pmu-emul.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu)
420420
kvm_pmu_update_state(vcpu);
421421
}
422422

423-
/**
423+
/*
424424
* When perf interrupt is an NMI, we cannot safely notify the vcpu corresponding
425425
* to the event.
426426
* This is why we need a callback to do it once outside of the NMI context.
@@ -491,7 +491,7 @@ static u64 compute_period(struct kvm_pmc *pmc, u64 counter)
491491
return val;
492492
}
493493

494-
/**
494+
/*
495495
* When the perf event overflows, set the overflow status and inform the vcpu.
496496
*/
497497
static void kvm_pmu_perf_overflow(struct perf_event *perf_event,

arch/arm64/kvm/sys_regs.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,7 +3172,8 @@ static void unhandled_cp_access(struct kvm_vcpu *vcpu,
31723172
/**
31733173
* kvm_handle_cp_64 -- handles a mrrc/mcrr trap on a guest CP14/CP15 access
31743174
* @vcpu: The VCPU pointer
3175-
* @run: The kvm_run struct
3175+
* @global: &struct sys_reg_desc
3176+
* @nr_global: size of the @global array
31763177
*/
31773178
static int kvm_handle_cp_64(struct kvm_vcpu *vcpu,
31783179
const struct sys_reg_desc *global,
@@ -3339,7 +3340,9 @@ static int kvm_emulate_cp15_id_reg(struct kvm_vcpu *vcpu,
33393340
/**
33403341
* kvm_handle_cp_32 -- handles a mrc/mcr trap on a guest CP14/CP15 access
33413342
* @vcpu: The VCPU pointer
3342-
* @run: The kvm_run struct
3343+
* @params: &struct sys_reg_params
3344+
* @global: &struct sys_reg_desc
3345+
* @nr_global: size of the @global array
33433346
*/
33443347
static int kvm_handle_cp_32(struct kvm_vcpu *vcpu,
33453348
struct sys_reg_params *params,

arch/arm64/kvm/vgic/vgic-init.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,15 @@ int vgic_lazy_init(struct kvm *kvm)
447447
/* RESOURCE MAPPING */
448448

449449
/**
450+
* kvm_vgic_map_resources - map the MMIO regions
451+
* @kvm: kvm struct pointer
452+
*
450453
* Map the MMIO regions depending on the VGIC model exposed to the guest
451454
* called on the first VCPU run.
452455
* Also map the virtual CPU interface into the VM.
453456
* v2 calls vgic_init() if not already done.
454457
* v3 and derivatives return an error if the VGIC is not initialized.
455458
* vgic_ready() returns true if this function has succeeded.
456-
* @kvm: kvm struct pointer
457459
*/
458460
int kvm_vgic_map_resources(struct kvm *kvm)
459461
{

arch/arm64/kvm/vgic/vgic-its.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ struct vgic_translation_cache_entry {
163163
* @cte_esz: collection table entry size
164164
* @dte_esz: device table entry size
165165
* @ite_esz: interrupt translation table entry size
166-
* @save tables: save the ITS tables into guest RAM
166+
* @save_tables: save the ITS tables into guest RAM
167167
* @restore_tables: restore the ITS internal structs from tables
168168
* stored in guest RAM
169169
* @commit: initialize the registers which expose the ABI settings,
@@ -2156,7 +2156,7 @@ static u32 compute_next_eventid_offset(struct list_head *h, struct its_ite *ite)
21562156
}
21572157

21582158
/**
2159-
* entry_fn_t - Callback called on a table entry restore path
2159+
* typedef entry_fn_t - Callback called on a table entry restore path
21602160
* @its: its handle
21612161
* @id: id of the entry
21622162
* @entry: pointer to the entry

arch/arm64/kvm/vgic/vgic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void vgic_irq_set_phys_active(struct vgic_irq *irq, bool active)
184184
}
185185

186186
/**
187-
* kvm_vgic_target_oracle - compute the target vcpu for an irq
187+
* vgic_target_oracle - compute the target vcpu for an irq
188188
*
189189
* @irq: The irq to route. Must be already locked.
190190
*

0 commit comments

Comments
 (0)