iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RISC-V: KVM: Add Sv57x4 mode support for G-stage

Browse Source 
Latest QEMU supports G-stage Sv57x4 mode so this patch extends KVM
RISC-V G-stage handling to detect and use Sv57x4 mode when available.

Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Signed-off-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Anup Patel
2022-05-09 10:43:39 +05:30
committed by Anup Patel
parent 26708234eb
commit b4bbb95ea6
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/riscv/include/asm/csr.h
View File

@@ -117,6 +117,7 @@
#define HGATP_MODE_SV32X4 _AC(1, UL) #define HGATP_MODE_SV32X4 _AC(1, UL)
#define HGATP_MODE_SV39X4 _AC(8, UL) #define HGATP_MODE_SV39X4 _AC(8, UL)
#define HGATP_MODE_SV48X4 _AC(9, UL) #define HGATP_MODE_SV48X4 _AC(9, UL)
#define HGATP_MODE_SV57X4 _AC(10, UL)
#define HGATP32_MODE_SHIFT 31 #define HGATP32_MODE_SHIFT 31
#define HGATP32_VMID_SHIFT 22 #define HGATP32_VMID_SHIFT 22

3
arch/riscv/kvm/main.c
View File

@@ -105,6 +105,9 @@ int kvm_arch_init(void *opaque)
case HGATP_MODE_SV48X4: case HGATP_MODE_SV48X4:
str = "Sv48x4"; str = "Sv48x4";
break; break;
case HGATP_MODE_SV57X4:
str = "Sv57x4";
break;
default: default:
return -ENODEV; return -ENODEV;
} }

11
arch/riscv/kvm/mmu.c
View File

@@ -751,14 +751,23 @@ void kvm_riscv_gstage_update_hgatp(struct kvm_vcpu *vcpu)
void kvm_riscv_gstage_mode_detect(void) void kvm_riscv_gstage_mode_detect(void)
{ {
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
/* Try Sv57x4 G-stage mode */
csr_write(CSR_HGATP, HGATP_MODE_SV57X4 << HGATP_MODE_SHIFT);
if ((csr_read(CSR_HGATP) >> HGATP_MODE_SHIFT) == HGATP_MODE_SV57X4) {
gstage_mode = (HGATP_MODE_SV57X4 << HGATP_MODE_SHIFT);
gstage_pgd_levels = 5;
goto skip_sv48x4_test;
}
/* Try Sv48x4 G-stage mode */ /* Try Sv48x4 G-stage mode */
csr_write(CSR_HGATP, HGATP_MODE_SV48X4 << HGATP_MODE_SHIFT); csr_write(CSR_HGATP, HGATP_MODE_SV48X4 << HGATP_MODE_SHIFT);
if ((csr_read(CSR_HGATP) >> HGATP_MODE_SHIFT) == HGATP_MODE_SV48X4) { if ((csr_read(CSR_HGATP) >> HGATP_MODE_SHIFT) == HGATP_MODE_SV48X4) {
gstage_mode = (HGATP_MODE_SV48X4 << HGATP_MODE_SHIFT); gstage_mode = (HGATP_MODE_SV48X4 << HGATP_MODE_SHIFT);
gstage_pgd_levels = 4; gstage_pgd_levels = 4;
} }
csr_write(CSR_HGATP, 0); skip_sv48x4_test:
csr_write(CSR_HGATP, 0);
__kvm_riscv_hfence_gvma_all(); __kvm_riscv_hfence_gvma_all();
#endif #endif
} }