diff options
| author | Anup Patel <apatel@ventanamicro.com> | 2023-11-28 20:26:23 +0530 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-02-09 15:45:22 +0000 |
| commit | 667685691c5dc9a4144feb008ebff71d5f7b1e68 (patch) | |
| tree | 0a96135ab5b11fd002d34877e8f6a785b106a860 | |
| parent | 6331850d6bc0a791b9ad8a03920ae8509fa0a977 (diff) | |
| download | kvmtool-667685691c5dc9a4144feb008ebff71d5f7b1e68.tar.gz | |
riscv: Add Zicntr and Zihpm extension support
When the Zicntr and Zihpm extension is available expose it to the guest
via device tree so that guest can use it.
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Link: https://lore.kernel.org/r/20231128145628.413414-6-apatel@ventanamicro.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | riscv/fdt.c | 2 | ||||
| -rw-r--r-- | riscv/include/kvm/kvm-config-arch.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/riscv/fdt.c b/riscv/fdt.c index cfe4678a..19786afb 100644 --- a/riscv/fdt.c +++ b/riscv/fdt.c @@ -26,7 +26,9 @@ struct isa_ext_info isa_info_arr[] = { {"zbs", KVM_RISCV_ISA_EXT_ZBS}, {"zicbom", KVM_RISCV_ISA_EXT_ZICBOM}, {"zicboz", KVM_RISCV_ISA_EXT_ZICBOZ}, + {"zicntr", KVM_RISCV_ISA_EXT_ZICNTR}, {"zihintpause", KVM_RISCV_ISA_EXT_ZIHINTPAUSE}, + {"zihpm", KVM_RISCV_ISA_EXT_ZIHPM}, }; static void dump_fdt(const char *dtb_file, void *fdt) diff --git a/riscv/include/kvm/kvm-config-arch.h b/riscv/include/kvm/kvm-config-arch.h index 978037a8..af5c4b8b 100644 --- a/riscv/include/kvm/kvm-config-arch.h +++ b/riscv/include/kvm/kvm-config-arch.h @@ -55,9 +55,15 @@ struct kvm_config_arch { OPT_BOOLEAN('\0', "disable-zicboz", \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZICBOZ], \ "Disable Zicboz Extension"), \ + OPT_BOOLEAN('\0', "disable-zicntr", \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZICNTR], \ + "Disable Zicntr Extension"), \ OPT_BOOLEAN('\0', "disable-zihintpause", \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIHINTPAUSE],\ "Disable Zihintpause Extension"), \ + OPT_BOOLEAN('\0', "disable-zihpm", \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_ZIHPM], \ + "Disable Zihpm Extension"), \ OPT_BOOLEAN('\0', "disable-sbi-legacy", \ &(cfg)->sbi_ext_disabled[KVM_RISCV_SBI_EXT_V01], \ "Disable SBI Legacy Extensions"), \ |