riscv: support new isa extension detection devicetree properties
Subsystems (2)
PATCH v2 1/1 riscv: support new isa extension detection devicetree properties
From: Conor Dooley <[email protected]>
A few months ago I submitted a patch to various lists, deprecating "riscv,isa" with a lengthy commit message [0] that is now commit aeb71e42caae ("dt-bindings: riscv: deprecate riscv,isa") in the Linux kernel tree. Primarily, the goal was to replace "riscv,isa" with a new set of properties that allowed for strictly defining the meaning of various extensions, where "riscv,isa" was tied to whatever definitions inflicted upon us by the ISA manual, which have seen some variance over time.
Two new properties were introduced: "riscv,isa-base" and "riscv,isa-extensions". The former is a simple string to communicate the base ISA implemented by a hart and the latter an array of strings used to communicate the set of ISA extensions supported, per the definitions of each substring in extensions.yaml [1]. A beneficial side effect was also the ability to define vendor extensions in a more "official" way, as the ISA manual and other RVI specifications only covered the format for vendor extensions in the ISA string, but not the meaning of vendor extensions, for obvious reasons.
Add support for setting these two new properties in the devicetrees for the various devicetree platforms supported by QEMU for RISC-V. The Linux kernel already supports parsing ISA extensions from these new properties, and documenting them in the dt-binding is a requirement for new extension detection being added to the kernel.
A side effect of the implementation is that the meaning for elements in "riscv,isa" and in "riscv,isa-extensions" are now tied together as they are constructed from the same source. The same applies to the ISA string provided in ACPI tables, but there does not appear to be any strict definitions of meanings in ACPI land either.
---
Changes in v2:
- use g_strdup() for multiletter extension string copying
- wrap stuff in #ifndef to prevent breaking the user mode build
- rename riscv_isa_set_props() -> riscv_isa_write_fdt()
--- hw/riscv/sifive_u.c | 7 ++----- hw/riscv/spike.c | 6 ++---- hw/riscv/virt.c | 6 ++---- target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 1 + 5 files changed, 57 insertions(+), 13 deletions(-)
hw/riscv/sifive_u.c +2 -5
@@ -171,7 +171,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,int cpu_phandle = phandle++; nodename =g_strdup_printf ("/cpus/cpu@%d" , cpu);char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu); -char *isa;qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) {
@@ -180,11 +179,10 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); } - isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); +riscv_isa_write_fdt (&s->soc.u_cpus.harts[cpu -1 ], fdt, nodename); }else { - isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]); +riscv_isa_write_fdt (&s->soc.e_cpus.harts[0 ], fdt, nodename); } -qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );qemu_fdt_setprop_cell (fdt, nodename,"reg" , cpu);
@@ -194,7 +192,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 ); -g_free (isa);g_free (intc);g_free (nodename); }
hw/riscv/spike.c +2 -4
@@ -59,7 +59,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,MachineState *ms =MACHINE (s);uint32_t *clint_cells;uint32_t cpu_phandle, intc_phandle, phandle =1 ; -char *name, *mem_name, *clint_name, *clust_name; +char *mem_name, *clint_name, *clust_name;char *core_name, *cpu_name, *intc_name;static const char *const clint_compat[2 ] = {"sifive,clint0" ,"riscv,clint0"
@@ -113,9 +113,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); } - name =riscv_isa_string (&s->soc[socket].harts[cpu]); -qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (&s->soc[socket].harts[cpu], fdt, cpu_name);qemu_fdt_setprop_string (fdt, cpu_name,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, cpu_name,"status" ,"okay" ); qemu_fdt_setprop_cell(fdt, cpu_name, "reg",
hw/riscv/virt.c +2 -4
@@ -238,7 +238,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,int cpu;uint32_t cpu_phandle;MachineState *ms =MACHINE (s); -char *name, *cpu_name, *core_name, *intc_name, *sv_name; +char *cpu_name, *core_name, *intc_name, *sv_name;bool is_32_bit =riscv_is_32bit (&s->soc[0 ]);uint8_t satp_mode_max;
@@ -259,9 +259,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,g_free (sv_name); } - name =riscv_isa_string (cpu_ptr); -qemu_fdt_setprop_string (ms->fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (cpu_ptr, ms->fdt, cpu_name);if (cpu_ptr->cfg.ext_zicbom) { qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbom-block-size",
target/riscv/cpu.c +50 -0
62 lines not on this page · raw message
target/riscv/cpu.h +1 -0
@@ -496,6 +496,7 @@ void riscv_cpu_list(void);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type,
Signature · 1 line
2.39.2
Quoted 33 lines · Conor Dooley
From: Conor Dooley <[email protected]>
A few months ago I submitted a patch to various lists, deprecating "riscv,isa" with a lengthy commit message [0] that is now commit
aeb71e42caae("dt-bindings: riscv: deprecate riscv,isa") in the Linux kernel tree. Primarily, the goal was to replace "riscv,isa" with a new set of properties that allowed for strictly defining the meaning of various extensions, where "riscv,isa" was tied to whatever definitions inflicted upon us by the ISA manual, which have seen some variance over time.Two new properties were introduced: "riscv,isa-base" and "riscv,isa-extensions". The former is a simple string to communicate the base ISA implemented by a hart and the latter an array of strings used to communicate the set of ISA extensions supported, per the definitions of each substring in
extensions.yaml[1]. A beneficial side effect was also the ability to define vendor extensions in a more "official" way, as the ISA manual and other RVI specifications only covered the format for vendor extensions in the ISA string, but not the meaning of vendor extensions, for obvious reasons.Add support for setting these two new properties in the devicetrees for the various devicetree platforms supported by QEMU for RISC-V. The Linux kernel already supports parsing ISA extensions from these new properties, and documenting them in the dt-binding is a requirement for new extension detection being added to the kernel.
A side effect of the implementation is that the meaning for elements in "riscv,isa" and in "riscv,isa-extensions" are now tied together as they are constructed from the same source. The same applies to the ISA string provided in ACPI tables, but there does not appear to be any strict definitions of meanings in ACPI land either.
Quoted 4 lines
Signed-off-by Conor Dooley <[email protected]>---
Quoted 183 lines
Changes in v2:
- useg_strdup()for multiletter extension string copying
- wrap stuff in #ifndef to prevent breaking the user mode build
- renameriscv_isa_set_props()->riscv_isa_write_fdt()CC Alistair Francis <[email protected]>CC Bin Meng <[email protected]>CC Palmer Dabbelt <[email protected]>CC Weiwei Li <[email protected]>CC Daniel Henrique Barboza <[email protected]>CC Liu Zhiwei <[email protected]>--- hw/riscv/sifive_u.c | 7 ++----- hw/riscv/spike.c | 6 ++---- hw/riscv/virt.c | 6 ++---- target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 1 + 5 files changed, 57 insertions(+), 13 deletions(-)hw/riscv/sifive_u.c +2
-5@@ -171,7 +171,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,int cpu_phandle = phandle++; nodename =g_strdup_printf ("/cpus/cpu@%d" , cpu);char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu); -char *isa;qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) {@@ -180,11 +179,10 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); } - isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); +riscv_isa_write_fdt (&s->soc.u_cpus.harts[cpu -1 ], fdt, nodename); }else { - isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]); +riscv_isa_write_fdt (&s->soc.e_cpus.harts[0 ], fdt, nodename); } -qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );qemu_fdt_setprop_cell (fdt, nodename,"reg" , cpu);@@ -194,7 +192,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 ); -g_free (isa);g_free (intc);g_free (nodename); }hw/riscv/spike.c +2
-4@@ -59,7 +59,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,MachineState *ms =MACHINE (s);uint32_t *clint_cells;uint32_t cpu_phandle, intc_phandle, phandle =1 ; -char *name, *mem_name, *clint_name, *clust_name; +char *mem_name, *clint_name, *clust_name;char *core_name, *cpu_name, *intc_name;static const char *const clint_compat[2 ] = {"sifive,clint0" ,"riscv,clint0" @@ -113,9 +113,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); } - name =riscv_isa_string (&s->soc[socket].harts[cpu]); -qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (&s->soc[socket].harts[cpu], fdt, cpu_name);qemu_fdt_setprop_string (fdt, cpu_name,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, cpu_name,"status" ,"okay" ); qemu_fdt_setprop_cell(fdt, cpu_name, "reg",hw/riscv/virt.c +2
-4@@ -238,7 +238,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,int cpu;uint32_t cpu_phandle;MachineState *ms =MACHINE (s); -char *name, *cpu_name, *core_name, *intc_name, *sv_name; +char *cpu_name, *core_name, *intc_name, *sv_name;bool is_32_bit =riscv_is_32bit (&s->soc[0 ]);uint8_t satp_mode_max;@@ -259,9 +259,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,g_free (sv_name); } - name =riscv_isa_string (cpu_ptr); -qemu_fdt_setprop_string (ms->fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (cpu_ptr, ms->fdt, cpu_name);if (cpu_ptr->cfg.ext_zicbom) { qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbom-block-size",target/riscv/cpu.c +50
-0@@ -31,6 +31,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "sysemu/device_tree.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" #include "kvm/kvm_riscv.h" @@ -1735,6 +1736,55 @@ char *riscv_isa_string(RISCVCPU *cpu)return isa_str; } +#ifndef CONFIG_USER_ONLY +static char **riscv_isa_extensions_list (RISCVCPU *cpu,int *count) +{ +int maxlen =ARRAY_SIZE (riscv_single_letter_exts) +ARRAY_SIZE (isa_edata_arr); + char **extensions = g_new(char *, maxlen); + +for (int i =0 ; i <sizeof (riscv_single_letter_exts) -1 ; i++) { +if (cpu->env.misa_ext &RV (riscv_single_letter_exts[i])) { + extensions[*count] =g_new (char,2 ); +snprintf (extensions[*count],2 ,"%c" , +qemu_tolower (riscv_single_letter_exts[i])); + (*count)++; + } + } + +for (const RISCVIsaExtData *edata = isa_edata_arr; edata && edata->name; edata++) { +if (isa_ext_is_enabled (cpu, edata->ext_enable_offset)) { + extensions[*count] =g_strdup (edata->name); + (*count)++; + } + } + +return extensions; +} + +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename) +{ +const size_t maxlen =sizeof ("rv128i" ); + g_autofree char *isa_base = g_new(char, maxlen); + g_autofree char *riscv_isa; +char **isa_extensions; +int count =0 ; + + riscv_isa =riscv_isa_string (cpu); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , riscv_isa); + +snprintf (isa_base, maxlen,"rv%di" ,TARGET_LONG_BITS ); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa-base" , isa_base); + + isa_extensions =riscv_isa_extensions_list (cpu, &count); +qemu_fdt_setprop_string_array (fdt, nodename,"riscv,isa-extensions" , + isa_extensions, count); + +for (int i =0 ; i < count; i++) { +g_free (isa_extensions[i]); + } +} +#endif +static gint riscv_cpu_list_compare (gconstpointer a,gconstpointer b) {ObjectClass *class_a = (ObjectClass *)a;target/riscv/cpu.h +1
-0@@ -496,6 +496,7 @@ void riscv_cpu_list(void);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type,
Quoted 184 lines · Conor Dooley
From: Conor Dooley <[email protected]>
A few months ago I submitted a patch to various lists, deprecating "riscv,isa" with a lengthy commit message [0] that is now commit
aeb71e42caae("dt-bindings: riscv: deprecate riscv,isa") in the Linux kernel tree. Primarily, the goal was to replace "riscv,isa" with a new set of properties that allowed for strictly defining the meaning of various extensions, where "riscv,isa" was tied to whatever definitions inflicted upon us by the ISA manual, which have seen some variance over time.Two new properties were introduced: "riscv,isa-base" and "riscv,isa-extensions". The former is a simple string to communicate the base ISA implemented by a hart and the latter an array of strings used to communicate the set of ISA extensions supported, per the definitions of each substring in
extensions.yaml[1]. A beneficial side effect was also the ability to define vendor extensions in a more "official" way, as the ISA manual and other RVI specifications only covered the format for vendor extensions in the ISA string, but not the meaning of vendor extensions, for obvious reasons.Add support for setting these two new properties in the devicetrees for the various devicetree platforms supported by QEMU for RISC-V. The Linux kernel already supports parsing ISA extensions from these new properties, and documenting them in the dt-binding is a requirement for new extension detection being added to the kernel.
A side effect of the implementation is that the meaning for elements in "riscv,isa" and in "riscv,isa-extensions" are now tied together as they are constructed from the same source. The same applies to the ISA string provided in ACPI tables, but there does not appear to be any strict definitions of meanings in ACPI land either.
Signed-off-by Conor Dooley <[email protected]>---
Changes in v2:
- useg_strdup()for multiletter extension string copying
- wrap stuff in #ifndef to prevent breaking the user mode build
- renameriscv_isa_set_props()->riscv_isa_write_fdt()CC Alistair Francis <[email protected]>CC Bin Meng <[email protected]>CC Palmer Dabbelt <[email protected]>CC Weiwei Li <[email protected]>CC Daniel Henrique Barboza <[email protected]>CC Liu Zhiwei <[email protected]>--- hw/riscv/sifive_u.c | 7 ++----- hw/riscv/spike.c | 6 ++---- hw/riscv/virt.c | 6 ++---- target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 1 + 5 files changed, 57 insertions(+), 13 deletions(-)hw/riscv/sifive_u.c +2
-5@@ -171,7 +171,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,int cpu_phandle = phandle++; nodename =g_strdup_printf ("/cpus/cpu@%d" , cpu);char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu); -char *isa;qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) {@@ -180,11 +179,10 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); } - isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); +riscv_isa_write_fdt (&s->soc.u_cpus.harts[cpu -1 ], fdt, nodename); }else { - isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]); +riscv_isa_write_fdt (&s->soc.e_cpus.harts[0 ], fdt, nodename); } -qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );qemu_fdt_setprop_cell (fdt, nodename,"reg" , cpu);@@ -194,7 +192,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 ); -g_free (isa);g_free (intc);g_free (nodename); }hw/riscv/spike.c +2
-4@@ -59,7 +59,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,MachineState *ms =MACHINE (s);uint32_t *clint_cells;uint32_t cpu_phandle, intc_phandle, phandle =1 ; -char *name, *mem_name, *clint_name, *clust_name; +char *mem_name, *clint_name, *clust_name;char *core_name, *cpu_name, *intc_name;static const char *const clint_compat[2 ] = {"sifive,clint0" ,"riscv,clint0" @@ -113,9 +113,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); } - name =riscv_isa_string (&s->soc[socket].harts[cpu]); -qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (&s->soc[socket].harts[cpu], fdt, cpu_name);qemu_fdt_setprop_string (fdt, cpu_name,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, cpu_name,"status" ,"okay" ); qemu_fdt_setprop_cell(fdt, cpu_name, "reg",hw/riscv/virt.c +2
-4@@ -238,7 +238,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,int cpu;uint32_t cpu_phandle;MachineState *ms =MACHINE (s); -char *name, *cpu_name, *core_name, *intc_name, *sv_name; +char *cpu_name, *core_name, *intc_name, *sv_name;bool is_32_bit =riscv_is_32bit (&s->soc[0 ]);uint8_t satp_mode_max;@@ -259,9 +259,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,g_free (sv_name); } - name =riscv_isa_string (cpu_ptr); -qemu_fdt_setprop_string (ms->fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (cpu_ptr, ms->fdt, cpu_name);if (cpu_ptr->cfg.ext_zicbom) { qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbom-block-size",target/riscv/cpu.c +28
-0@@ -31,6 +31,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "sysemu/device_tree.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" #include "kvm/kvm_riscv.h" @@ -1735,6 +1736,55 @@ char *riscv_isa_string(RISCVCPU *cpu)return isa_str; } +#ifndef CONFIG_USER_ONLY +static char **riscv_isa_extensions_list (RISCVCPU *cpu,int *count) +{ +int maxlen =ARRAY_SIZE (riscv_single_letter_exts) +ARRAY_SIZE (isa_edata_arr); + char **extensions = g_new(char *, maxlen); + +for (int i =0 ; i <sizeof (riscv_single_letter_exts) -1 ; i++) { +if (cpu->env.misa_ext &RV (riscv_single_letter_exts[i])) { + extensions[*count] =g_new (char,2 ); +snprintf (extensions[*count],2 ,"%c" , +qemu_tolower (riscv_single_letter_exts[i])); + (*count)++; + } + } + +for (const RISCVIsaExtData *edata = isa_edata_arr; edata && edata->name; edata++) { +if (isa_ext_is_enabled (cpu, edata->ext_enable_offset)) { + extensions[*count] =g_strdup (edata->name); + (*count)++; + } + } + +return extensions; +} + +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename) +{
target/riscv/cpu.c char *riscv_isa_string(RISCVCPU *cpu) · line 1775
Quoted 10 lines
target/riscv/cpu.c +10
-0+const size_t maxlen =sizeof ("rv128i" ); + g_autofree char *isa_base = g_new(char, maxlen); + g_autofree char *riscv_isa; +char **isa_extensions; +int count =0 ; + + riscv_isa =riscv_isa_string (cpu); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , riscv_isa); + +snprintf (isa_base, maxlen,"rv%di" ,TARGET_LONG_BITS );
This should dynamically come from misa_mxl_max not the compile time target
Alistair
Quoted 31 lines
target/riscv/cpu.c +12
-0+qemu_fdt_setprop_string (fdt, nodename,"riscv,isa-base" , isa_base); + + isa_extensions =riscv_isa_extensions_list (cpu, &count); +qemu_fdt_setprop_string_array (fdt, nodename,"riscv,isa-extensions" , + isa_extensions, count); + +for (int i =0 ; i < count; i++) { +g_free (isa_extensions[i]); + } +} +#endif +static gint riscv_cpu_list_compare (gconstpointer a,gconstpointer b) {ObjectClass *class_a = (ObjectClass *)a;target/riscv/cpu.h +1
-1@@ -496,6 +496,7 @@ void riscv_cpu_list(void);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type, --2.39.2
On Mon, Dec 18, 2023 at 02:37:55PM +1000, Alistair Francis wrote:
...
Quoted 6 lines
Quoted 6 lines
target/riscv/cpu.c +6
-0+void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename) +{ +const size_t maxlen =sizeof ("rv128i" ); + g_autofree char *isa_base = g_new(char, maxlen); + g_autofree char *riscv_isa; +char **isa_extensions;
Quoted 9 lines
target/riscv/cpu.c char *riscv_isa_string(RISCVCPU *cpu) · line 1775
Quoted 6 lines
target/riscv/cpu.c +6
-0+int count =0 ; + + riscv_isa =riscv_isa_string (cpu); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , riscv_isa); + +snprintf (isa_base, maxlen,"rv%di" ,TARGET_LONG_BITS );This should dynamically come from
misa_mxl_maxnot the compile time target
Need to also fix riscv_isa_string()
Thanks,
drew
Quoted 162 lines · Conor Dooley
From: Conor Dooley <[email protected]>
A few months ago I submitted a patch to various lists, deprecating "riscv,isa" with a lengthy commit message [0] that is now commit
aeb71e42caae("dt-bindings: riscv: deprecate riscv,isa") in the Linux kernel tree. Primarily, the goal was to replace "riscv,isa" with a new set of properties that allowed for strictly defining the meaning of various extensions, where "riscv,isa" was tied to whatever definitions inflicted upon us by the ISA manual, which have seen some variance over time.Two new properties were introduced: "riscv,isa-base" and "riscv,isa-extensions". The former is a simple string to communicate the base ISA implemented by a hart and the latter an array of strings used to communicate the set of ISA extensions supported, per the definitions of each substring in
extensions.yaml[1]. A beneficial side effect was also the ability to define vendor extensions in a more "official" way, as the ISA manual and other RVI specifications only covered the format for vendor extensions in the ISA string, but not the meaning of vendor extensions, for obvious reasons.Add support for setting these two new properties in the devicetrees for the various devicetree platforms supported by QEMU for RISC-V. The Linux kernel already supports parsing ISA extensions from these new properties, and documenting them in the dt-binding is a requirement for new extension detection being added to the kernel.
A side effect of the implementation is that the meaning for elements in "riscv,isa" and in "riscv,isa-extensions" are now tied together as they are constructed from the same source. The same applies to the ISA string provided in ACPI tables, but there does not appear to be any strict definitions of meanings in ACPI land either.
Signed-off-by Conor Dooley <[email protected]>---
Changes in v2:
- useg_strdup()for multiletter extension string copying
- wrap stuff in #ifndef to prevent breaking the user mode build
- renameriscv_isa_set_props()->riscv_isa_write_fdt()CC Alistair Francis <[email protected]>CC Bin Meng <[email protected]>CC Palmer Dabbelt <[email protected]>CC Weiwei Li <[email protected]>CC Daniel Henrique Barboza <[email protected]>CC Liu Zhiwei <[email protected]>--- hw/riscv/sifive_u.c | 7 ++----- hw/riscv/spike.c | 6 ++---- hw/riscv/virt.c | 6 ++---- target/riscv/cpu.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ target/riscv/cpu.h | 1 + 5 files changed, 57 insertions(+), 13 deletions(-)hw/riscv/sifive_u.c +2
-5@@ -171,7 +171,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,int cpu_phandle = phandle++; nodename =g_strdup_printf ("/cpus/cpu@%d" , cpu);char *intc =g_strdup_printf ("/cpus/cpu@%d/interrupt-controller" , cpu); -char *isa;qemu_fdt_add_subnode (fdt, nodename);/* cpu 0 is the management hart that does not have mmu */ if (cpu !=0 ) {@@ -180,11 +179,10 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, nodename,"mmu-type" ,"riscv,sv48" ); } - isa =riscv_isa_string (&s->soc.u_cpus.harts[cpu -1 ]); +riscv_isa_write_fdt (&s->soc.u_cpus.harts[cpu -1 ], fdt, nodename); }else { - isa =riscv_isa_string (&s->soc.e_cpus.harts[0 ]); +riscv_isa_write_fdt (&s->soc.e_cpus.harts[0 ], fdt, nodename); } -qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , isa);qemu_fdt_setprop_string (fdt, nodename,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, nodename,"status" ,"okay" );qemu_fdt_setprop_cell (fdt, nodename,"reg" , cpu);@@ -194,7 +192,6 @@ static void create_fdt(SiFiveUState *s, const MemMapEntry *memmap,qemu_fdt_setprop_string (fdt, intc,"compatible" ,"riscv,cpu-intc" );qemu_fdt_setprop (fdt, intc,"interrupt-controller" ,NULL ,0 );qemu_fdt_setprop_cell (fdt, intc,"#interrupt-cells" ,1 ); -g_free (isa);g_free (intc);g_free (nodename); }hw/riscv/spike.c +2
-4@@ -59,7 +59,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,MachineState *ms =MACHINE (s);uint32_t *clint_cells;uint32_t cpu_phandle, intc_phandle, phandle =1 ; -char *name, *mem_name, *clint_name, *clust_name; +char *mem_name, *clint_name, *clust_name;char *core_name, *cpu_name, *intc_name;static const char *const clint_compat[2 ] = {"sifive,clint0" ,"riscv,clint0" @@ -113,9 +113,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap, }else {qemu_fdt_setprop_string (fdt, cpu_name,"mmu-type" ,"riscv,sv48" ); } - name =riscv_isa_string (&s->soc[socket].harts[cpu]); -qemu_fdt_setprop_string (fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (&s->soc[socket].harts[cpu], fdt, cpu_name);qemu_fdt_setprop_string (fdt, cpu_name,"compatible" ,"riscv" );qemu_fdt_setprop_string (fdt, cpu_name,"status" ,"okay" ); qemu_fdt_setprop_cell(fdt, cpu_name, "reg",hw/riscv/virt.c +2
-4@@ -238,7 +238,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,int cpu;uint32_t cpu_phandle;MachineState *ms =MACHINE (s); -char *name, *cpu_name, *core_name, *intc_name, *sv_name; +char *cpu_name, *core_name, *intc_name, *sv_name;bool is_32_bit =riscv_is_32bit (&s->soc[0 ]);uint8_t satp_mode_max;@@ -259,9 +259,7 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket,g_free (sv_name); } - name =riscv_isa_string (cpu_ptr); -qemu_fdt_setprop_string (ms->fdt, cpu_name,"riscv,isa" , name); -g_free (name); +riscv_isa_write_fdt (cpu_ptr, ms->fdt, cpu_name);if (cpu_ptr->cfg.ext_zicbom) { qemu_fdt_setprop_cell(ms->fdt, cpu_name, "riscv,cbom-block-size",target/riscv/cpu.c +7
-0@@ -31,6 +31,7 @@#include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "sysemu/device_tree.h" #include "sysemu/kvm.h" #include "sysemu/tcg.h" #include "kvm/kvm_riscv.h" @@ -1735,6 +1736,55 @@ char *riscv_isa_string(RISCVCPU *cpu)return isa_str; } +#ifndef CONFIG_USER_ONLY +static char **riscv_isa_extensions_list (RISCVCPU *cpu,int *count) +{ +int maxlen =ARRAY_SIZE (riscv_single_letter_exts) +ARRAY_SIZE (isa_edata_arr); + char **extensions = g_new(char *, maxlen); +
target/riscv/cpu.c char *riscv_isa_string(RISCVCPU *cpu) · line 1754
Quoted 10 lines
target/riscv/cpu.c +10
-0+for (int i =0 ; i <sizeof (riscv_single_letter_exts) -1 ; i++) { +if (cpu->env.misa_ext &RV (riscv_single_letter_exts[i])) { + extensions[*count] =g_new (char,2 ); +snprintf (extensions[*count],2 ,"%c" , +qemu_tolower (riscv_single_letter_exts[i])); + (*count)++; + } + } + +for (const RISCVIsaExtData *edata = isa_edata_arr; edata && edata->name; edata++) {
^ edata can never be NULL
(I know riscv_isa_string_ext() also has that check though...)
Quoted 20 lines
target/riscv/cpu.c +20
-0+if (isa_ext_is_enabled (cpu, edata->ext_enable_offset)) { + extensions[*count] =g_strdup (edata->name); + (*count)++; + } + } + +return extensions; +} + +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename) +{ +const size_t maxlen =sizeof ("rv128i" ); + g_autofree char *isa_base = g_new(char, maxlen); + g_autofree char *riscv_isa; +char **isa_extensions; +int count =0 ; + + riscv_isa =riscv_isa_string (cpu); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa" , riscv_isa); +
target/riscv/cpu.c char *riscv_isa_string(RISCVCPU *cpu) · line 1784
Quoted 10 lines
target/riscv/cpu.c +10
-0+snprintf (isa_base, maxlen,"rv%di" ,TARGET_LONG_BITS ); +qemu_fdt_setprop_string (fdt, nodename,"riscv,isa-base" , isa_base); + + isa_extensions =riscv_isa_extensions_list (cpu, &count); +qemu_fdt_setprop_string_array (fdt, nodename,"riscv,isa-extensions" , + isa_extensions, count); + +for (int i =0 ; i < count; i++) { +g_free (isa_extensions[i]); + }
Need g_free(isa_extensions) here.
Quoted 22 lines
target/riscv/cpu.c +3
-0+} +#endif +static gint riscv_cpu_list_compare (gconstpointer a,gconstpointer b) {ObjectClass *class_a = (ObjectClass *)a;target/riscv/cpu.h +1
-0@@ -496,6 +496,7 @@ void riscv_cpu_list(void);#define cpu_mmu_index riscv_cpu_mmu_index#ifndef CONFIG_USER_ONLY +void riscv_isa_write_fdt (RISCVCPU *cpu,void *fdt,char *nodename); void riscv_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, unsigned size, MMUAccessType access_type,Signature · 1 line
2.39.2
Otherwise,
Thanks,
drew