public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 16:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

LoongArch: KVM: Set reserved bits as zero in CPUCFG

Browse source 
Supported CPUCFG information comes from function _kvm_get_cpucfg_mask().
A bit should be zero if it is reserved by HW or if it is not supported
by KVM.

Also LoongArch software page table walk feature defined in CPUCFG2_LSPW
is supported by KVM, it should be enabled by default.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
This commit is contained in:
Bibo Mao 2024-03-06 09:12:13 +08:00 • committed by Huacai Chen
parent 90d35da658
commit aebd3bd586
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
arch/loongarch/kvm/vcpu.c
View file

@ -304,11 +304,18 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v)
return -EINVAL; return -EINVAL;
switch (id) { switch (id) {
case 2: case LOONGARCH_CPUCFG0:
*v = GENMASK(31, 0);
return 0;
case LOONGARCH_CPUCFG1:
/* CPUCFG1_MSGINT is not supported by KVM */
*v = GENMASK(25, 0);
return 0;
case LOONGARCH_CPUCFG2:
/* CPUCFG2 features unconditionally 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_LSPW | CPUCFG2_LAM;
/* /*
* For the ISA extensions listed below, if one is supported * For the ISA extensions listed below, if one is supported
* by the host, then it is also supported by KVM. * by the host, then it is also supported by KVM.
@ -318,14 +325,26 @@ static int _kvm_get_cpucfg_mask(int id, u64 *v)
if (cpu_has_lasx) if (cpu_has_lasx)
*v |= CPUCFG2_LASX; *v |= CPUCFG2_LASX;
return 0;
case LOONGARCH_CPUCFG3:
*v = GENMASK(16, 0);
return 0;
case LOONGARCH_CPUCFG4:
case LOONGARCH_CPUCFG5:
*v = GENMASK(31, 0);
return 0;
case LOONGARCH_CPUCFG16:
*v = GENMASK(16, 0);
return 0;
case LOONGARCH_CPUCFG17 ... LOONGARCH_CPUCFG20:
*v = GENMASK(30, 0);
return 0; return 0;
default: default:
/* /*
* No restrictions on other valid CPUCFG IDs' values, but * CPUCFG bits should be zero if reserved by HW or not
* CPUCFG data is limited to 32 bits as the LoongArch ISA * supported by KVM.
* manual says (Volume 1, Section 2.2.10.5 "CPUCFG").
*/ */
*v = U32_MAX; *v = 0;
return 0; return 0;
} }
} }
@ -344,7 +363,7 @@ static int kvm_check_cpucfg(int id, u64 val)
return -EINVAL; return -EINVAL;
switch (id) { switch (id) {
case 2: case LOONGARCH_CPUCFG2:
if (!(val & CPUCFG2_LLFTP)) if (!(val & CPUCFG2_LLFTP))
/* Guests must have a constant timer */ /* Guests must have a constant timer */
return -EINVAL; return -EINVAL;