Commit f0f5c489 authored by WANG Xuerui's avatar WANG Xuerui Committed by Huacai Chen

LoongArch: KVM: Streamline kvm_check_cpucfg() and improve comments

All the checks currently done in kvm_check_cpucfg can be realized with
early returns, so just do that to avoid extra cognitive burden related
to the return value handling.

While at it, clean up comments of _kvm_get_cpucfg_mask() and
kvm_check_cpucfg(), by removing comments that are merely restatement of
the code nearby, and paraphrasing the rest so they read more natural for
English speakers (that likely are not familiar with the actual Chinese-
influenced grammar).

No functional changes intended.
Reviewed-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarWANG Xuerui <git@xen0n.name>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent ec83f39d
...@@ -305,20 +305,16 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v) ...@@ -305,20 +305,16 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v)
switch (id) { switch (id) {
case 2: case 2:
/* Return CPUCFG2 features which have been supported by KVM */ /* CPUCFG2 features unconditionally supported by KVM */
*v = CPUCFG2_FP | CPUCFG2_FPSP | CPUCFG2_FPDP | *v = CPUCFG2_FP | CPUCFG2_FPSP | CPUCFG2_FPDP |
CPUCFG2_FPVERS | CPUCFG2_LLFTP | CPUCFG2_LLFTPREV | CPUCFG2_FPVERS | CPUCFG2_LLFTP | CPUCFG2_LLFTPREV |
CPUCFG2_LAM; CPUCFG2_LAM;
/* /*
* If LSX is supported by CPU, it is also supported by KVM, * For the ISA extensions listed below, if one is supported
* as we implement it. * by the host, then it is also supported by KVM.
*/ */
if (cpu_has_lsx) if (cpu_has_lsx)
*v |= CPUCFG2_LSX; *v |= CPUCFG2_LSX;
/*
* if LASX is supported by CPU, it is also supported by KVM,
* as we implement it.
*/
if (cpu_has_lasx) if (cpu_has_lasx)
*v |= CPUCFG2_LASX; *v |= CPUCFG2_LASX;
...@@ -349,24 +345,26 @@ static int kvm_check_cpucfg(int id, u64 val) ...@@ -349,24 +345,26 @@ static int kvm_check_cpucfg(int id, u64 val)
switch (id) { switch (id) {
case 2: case 2:
/* CPUCFG2 features checking */
if (!(val & CPUCFG2_LLFTP)) if (!(val & CPUCFG2_LLFTP))
/* The LLFTP must be set, as guest must has a constant timer */ /* Guests must have a constant timer */
ret = -EINVAL; return -EINVAL;
else if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP))) if ((val & CPUCFG2_FP) && (!(val & CPUCFG2_FPSP) || !(val & CPUCFG2_FPDP)))
/* Single and double float point must both be set when enable FP */ /* Single and double float point must both be set when FP is enabled */
ret = -EINVAL; return -EINVAL;
else if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP)) if ((val & CPUCFG2_LSX) && !(val & CPUCFG2_FP))
/* FP should be set when enable LSX */ /* LSX architecturally implies FP but val does not satisfy that */
ret = -EINVAL; return -EINVAL;
else if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX)) if ((val & CPUCFG2_LASX) && !(val & CPUCFG2_LSX))
/* LSX, FP should be set when enable LASX, and FP has been checked before. */ /* LASX architecturally implies LSX and FP but val does not satisfy that */
ret = -EINVAL; return -EINVAL;
break; return 0;
default: default:
break; /*
* Values for the other CPUCFG IDs are not being further validated
* besides the mask check above.
*/
return 0;
} }
return ret;
} }
static int kvm_get_one_reg(struct kvm_vcpu *vcpu, static int kvm_get_one_reg(struct kvm_vcpu *vcpu,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment