KVM: arm/arm64: Rename kvm_arm_config_vm to kvm_arm_setup_stage2
VM tends to be a very overloaded term in KVM, so let's keep it to describe the virtual machine. For the virtual memory setup, let's use the "stage2" suffix. Reviewed-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>hifive-unleashed-5.1
parent
233a7cb235
commit
bca607ebc7
|
@ -354,8 +354,12 @@ static inline void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu) {}
|
||||||
struct kvm *kvm_arch_alloc_vm(void);
|
struct kvm *kvm_arch_alloc_vm(void);
|
||||||
void kvm_arch_free_vm(struct kvm *kvm);
|
void kvm_arch_free_vm(struct kvm *kvm);
|
||||||
|
|
||||||
static inline int kvm_arm_config_vm(struct kvm *kvm, unsigned long type)
|
static inline int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
* On 32bit ARM, VMs get a static 40bit IPA stage2 setup,
|
||||||
|
* so any non-zero value used as type is illegal.
|
||||||
|
*/
|
||||||
if (type)
|
if (type)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -133,7 +133,7 @@
|
||||||
* 40 bits wide (T0SZ = 24). Systems with a PARange smaller than 40 bits are
|
* 40 bits wide (T0SZ = 24). Systems with a PARange smaller than 40 bits are
|
||||||
* not known to exist and will break with this configuration.
|
* not known to exist and will break with this configuration.
|
||||||
*
|
*
|
||||||
* The VTCR_EL2 is configured per VM and is initialised in kvm_arm_config_vm().
|
* The VTCR_EL2 is configured per VM and is initialised in kvm_arm_setup_stage2().
|
||||||
*
|
*
|
||||||
* Note that when using 4K pages, we concatenate two first level page tables
|
* Note that when using 4K pages, we concatenate two first level page tables
|
||||||
* together. With 16K pages, we concatenate 16 first level page tables.
|
* together. With 16K pages, we concatenate 16 first level page tables.
|
||||||
|
|
|
@ -511,6 +511,6 @@ void kvm_set_ipa_limit(void);
|
||||||
struct kvm *kvm_arch_alloc_vm(void);
|
struct kvm *kvm_arch_alloc_vm(void);
|
||||||
void kvm_arch_free_vm(struct kvm *kvm);
|
void kvm_arch_free_vm(struct kvm *kvm);
|
||||||
|
|
||||||
int kvm_arm_config_vm(struct kvm *kvm, unsigned long type);
|
int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type);
|
||||||
|
|
||||||
#endif /* __ARM64_KVM_HOST_H__ */
|
#endif /* __ARM64_KVM_HOST_H__ */
|
||||||
|
|
|
@ -189,7 +189,7 @@ void kvm_set_ipa_limit(void)
|
||||||
* all CPUs, as it is safe to run with or without the feature and
|
* all CPUs, as it is safe to run with or without the feature and
|
||||||
* the bit is RES0 on CPUs that don't support it.
|
* the bit is RES0 on CPUs that don't support it.
|
||||||
*/
|
*/
|
||||||
int kvm_arm_config_vm(struct kvm *kvm, unsigned long type)
|
int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
|
||||||
{
|
{
|
||||||
u64 vtcr = VTCR_EL2_FLAGS;
|
u64 vtcr = VTCR_EL2_FLAGS;
|
||||||
u32 parange, phys_shift;
|
u32 parange, phys_shift;
|
||||||
|
|
|
@ -120,7 +120,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
|
||||||
{
|
{
|
||||||
int ret, cpu;
|
int ret, cpu;
|
||||||
|
|
||||||
ret = kvm_arm_config_vm(kvm, type);
|
ret = kvm_arm_setup_stage2(kvm, type);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue