mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 05:32:00 +00:00
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>
This commit is contained in:
commit
4a09ddb833
@ -23,7 +23,7 @@
|
||||
|
||||
static DEFINE_PER_CPU(u64, mdcr_el2);
|
||||
|
||||
/**
|
||||
/*
|
||||
* save/restore_guest_debug_regs
|
||||
*
|
||||
* 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)
|
||||
|
||||
/**
|
||||
* kvm_arm_reset_debug_ptr - reset the debug ptr to point to the vcpu state
|
||||
* @vcpu: the vcpu pointer
|
||||
*/
|
||||
|
||||
void kvm_arm_reset_debug_ptr(struct kvm_vcpu *vcpu)
|
||||
|
@ -711,6 +711,7 @@ static int copy_sve_reg_indices(const struct kvm_vcpu *vcpu,
|
||||
|
||||
/**
|
||||
* kvm_arm_num_regs - how many registers do we present via KVM_GET_ONE_REG
|
||||
* @vcpu: the vCPU pointer
|
||||
*
|
||||
* This is for all registers.
|
||||
*/
|
||||
@ -729,6 +730,8 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
|
||||
|
||||
/**
|
||||
* kvm_arm_copy_reg_indices - get indices of all registers.
|
||||
* @vcpu: the vCPU pointer
|
||||
* @uindices: register list to copy
|
||||
*
|
||||
* We do core registers right here, then we append system regs.
|
||||
*/
|
||||
@ -902,8 +905,8 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu,
|
||||
|
||||
/**
|
||||
* kvm_arch_vcpu_ioctl_set_guest_debug - set up guest debugging
|
||||
* @kvm: pointer to the KVM struct
|
||||
* @kvm_guest_debug: the ioctl data buffer
|
||||
* @vcpu: the vCPU pointer
|
||||
* @dbg: the ioctl data buffer
|
||||
*
|
||||
* This sets up and enables the VM for guest debugging. Userspace
|
||||
* passes in a control flag to enable different debug types and
|
||||
|
@ -84,7 +84,7 @@ bool kvm_condition_valid32(const struct kvm_vcpu *vcpu)
|
||||
}
|
||||
|
||||
/**
|
||||
* adjust_itstate - adjust ITSTATE when emulating instructions in IT-block
|
||||
* kvm_adjust_itstate - adjust ITSTATE when emulating instructions in IT-block
|
||||
* @vcpu: The VCPU pointer
|
||||
*
|
||||
* When exceptions occur while instructions are executed in Thumb IF-THEN
|
||||
@ -120,7 +120,7 @@ static void kvm_adjust_itstate(struct kvm_vcpu *vcpu)
|
||||
}
|
||||
|
||||
/**
|
||||
* kvm_skip_instr - skip a trapped instruction and proceed to the next
|
||||
* kvm_skip_instr32 - skip a trapped instruction and proceed to the next
|
||||
* @vcpu: The vcpu pointer
|
||||
*/
|
||||
void kvm_skip_instr32(struct kvm_vcpu *vcpu)
|
||||
|
@ -95,7 +95,7 @@ void __vcpu_load_switch_sysregs(struct kvm_vcpu *vcpu)
|
||||
}
|
||||
|
||||
/**
|
||||
* __vcpu_put_switch_syregs - Restore host system registers to the physical CPU
|
||||
* __vcpu_put_switch_sysregs - Restore host system registers to the physical CPU
|
||||
*
|
||||
* @vcpu: The VCPU pointer
|
||||
*
|
||||
|
@ -305,7 +305,7 @@ static void invalidate_icache_guest_page(void *va, size_t size)
|
||||
* does.
|
||||
*/
|
||||
/**
|
||||
* unmap_stage2_range -- Clear stage2 page table entries to unmap a range
|
||||
* __unmap_stage2_range -- Clear stage2 page table entries to unmap a range
|
||||
* @mmu: The KVM stage-2 MMU pointer
|
||||
* @start: The intermediate physical base address of the range to unmap
|
||||
* @size: The size of the area to unmap
|
||||
|
@ -420,7 +420,7 @@ void kvm_pmu_sync_hwstate(struct kvm_vcpu *vcpu)
|
||||
kvm_pmu_update_state(vcpu);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* When perf interrupt is an NMI, we cannot safely notify the vcpu corresponding
|
||||
* to the event.
|
||||
* 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)
|
||||
return val;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* When the perf event overflows, set the overflow status and inform the vcpu.
|
||||
*/
|
||||
static void kvm_pmu_perf_overflow(struct perf_event *perf_event,
|
||||
|
@ -3172,7 +3172,8 @@ static void unhandled_cp_access(struct kvm_vcpu *vcpu,
|
||||
/**
|
||||
* kvm_handle_cp_64 -- handles a mrrc/mcrr trap on a guest CP14/CP15 access
|
||||
* @vcpu: The VCPU pointer
|
||||
* @run: The kvm_run struct
|
||||
* @global: &struct sys_reg_desc
|
||||
* @nr_global: size of the @global array
|
||||
*/
|
||||
static int kvm_handle_cp_64(struct kvm_vcpu *vcpu,
|
||||
const struct sys_reg_desc *global,
|
||||
@ -3339,7 +3340,9 @@ static int kvm_emulate_cp15_id_reg(struct kvm_vcpu *vcpu,
|
||||
/**
|
||||
* kvm_handle_cp_32 -- handles a mrc/mcr trap on a guest CP14/CP15 access
|
||||
* @vcpu: The VCPU pointer
|
||||
* @run: The kvm_run struct
|
||||
* @params: &struct sys_reg_params
|
||||
* @global: &struct sys_reg_desc
|
||||
* @nr_global: size of the @global array
|
||||
*/
|
||||
static int kvm_handle_cp_32(struct kvm_vcpu *vcpu,
|
||||
struct sys_reg_params *params,
|
||||
|
@ -447,13 +447,15 @@ int vgic_lazy_init(struct kvm *kvm)
|
||||
/* RESOURCE MAPPING */
|
||||
|
||||
/**
|
||||
* kvm_vgic_map_resources - map the MMIO regions
|
||||
* @kvm: kvm struct pointer
|
||||
*
|
||||
* Map the MMIO regions depending on the VGIC model exposed to the guest
|
||||
* called on the first VCPU run.
|
||||
* Also map the virtual CPU interface into the VM.
|
||||
* v2 calls vgic_init() if not already done.
|
||||
* v3 and derivatives return an error if the VGIC is not initialized.
|
||||
* vgic_ready() returns true if this function has succeeded.
|
||||
* @kvm: kvm struct pointer
|
||||
*/
|
||||
int kvm_vgic_map_resources(struct kvm *kvm)
|
||||
{
|
||||
|
@ -163,7 +163,7 @@ struct vgic_translation_cache_entry {
|
||||
* @cte_esz: collection table entry size
|
||||
* @dte_esz: device table entry size
|
||||
* @ite_esz: interrupt translation table entry size
|
||||
* @save tables: save the ITS tables into guest RAM
|
||||
* @save_tables: save the ITS tables into guest RAM
|
||||
* @restore_tables: restore the ITS internal structs from tables
|
||||
* stored in guest RAM
|
||||
* @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)
|
||||
}
|
||||
|
||||
/**
|
||||
* entry_fn_t - Callback called on a table entry restore path
|
||||
* typedef entry_fn_t - Callback called on a table entry restore path
|
||||
* @its: its handle
|
||||
* @id: id of the entry
|
||||
* @entry: pointer to the entry
|
||||
|
@ -184,7 +184,7 @@ void vgic_irq_set_phys_active(struct vgic_irq *irq, bool active)
|
||||
}
|
||||
|
||||
/**
|
||||
* kvm_vgic_target_oracle - compute the target vcpu for an irq
|
||||
* vgic_target_oracle - compute the target vcpu for an irq
|
||||
*
|
||||
* @irq: The irq to route. Must be already locked.
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user