diff options
| author | Andrew Jones <ajones@ventanamicro.com> | 2022-10-18 19:38:53 +0530 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-11-08 15:34:21 +0000 |
| commit | 798398f40a163d476ec142b57e35bc1de4f17ca0 (patch) | |
| tree | 747084b5d8acf14c0396959713c51851e4c969c9 | |
| parent | b721ac0ad88a828890a7e44aa7889675152997eb (diff) | |
| download | kvmtool-798398f40a163d476ec142b57e35bc1de4f17ca0.tar.gz | |
riscv: Add Zicbom extension support
When the Zicbom extension is available expose it to the guest.
Also provide the guest the size of the cache block through DT.
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20221018140854.69846-6-apatel@ventanamicro.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | riscv/fdt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/riscv/fdt.c b/riscv/fdt.c index 8d6da11b..30d3460b 100644 --- a/riscv/fdt.c +++ b/riscv/fdt.c @@ -19,6 +19,7 @@ struct isa_ext_info isa_info_arr[] = { {"sstc", KVM_RISCV_ISA_EXT_SSTC}, {"svinval", KVM_RISCV_ISA_EXT_SVINVAL}, {"zihintpause", KVM_RISCV_ISA_EXT_ZIHINTPAUSE}, + {"zicbom", KVM_RISCV_ISA_EXT_ZICBOM}, }; static void dump_fdt(const char *dtb_file, void *fdt) @@ -44,6 +45,7 @@ static void generate_cpu_nodes(void *fdt, struct kvm *kvm) int cpu, pos, i, index, valid_isa_len; const char *valid_isa_order = "IEMAFDQCLBJTPVNSUHKORWXYZG"; int arr_sz = ARRAY_SIZE(isa_info_arr); + unsigned long cbom_blksz = 0; _FDT(fdt_begin_node(fdt, "cpus")); _FDT(fdt_property_cell(fdt, "#address-cells", 0x1)); @@ -78,6 +80,13 @@ static void generate_cpu_nodes(void *fdt, struct kvm *kvm) /* This extension is not available in hardware */ continue; + if (isa_info_arr[i].ext_id == KVM_RISCV_ISA_EXT_ZICBOM && !cbom_blksz) { + reg.id = RISCV_CONFIG_REG(zicbom_block_size); + reg.addr = (unsigned long)&cbom_blksz; + if (ioctl(vcpu->vcpu_fd, KVM_GET_ONE_REG, ®) < 0) + die("KVM_GET_ONE_REG failed (config.zicbom_block_size)"); + } + if ((strlen(isa_info_arr[i].name) + pos + 1) >= CPU_ISA_MAX_LEN) { pr_warning("Insufficient space to append ISA exension\n"); break; @@ -97,6 +106,8 @@ static void generate_cpu_nodes(void *fdt, struct kvm *kvm) _FDT(fdt_property_string(fdt, "mmu-type", "riscv,sv32")); _FDT(fdt_property_string(fdt, "riscv,isa", cpu_isa)); + if (cbom_blksz) + _FDT(fdt_property_cell(fdt, "riscv,cbom-block-size", cbom_blksz)); _FDT(fdt_property_cell(fdt, "reg", cpu)); _FDT(fdt_property_string(fdt, "status", "okay")); |