Re: [PATCH v3] target/riscv: Use official extension names for AIA CSRs
On Sat, Aug 20, 2022 at 2:30 PM Anup Patel wrote: > > The arch review of AIA spec is completed and we now have official > extension names for AIA: Smaia (M-mode AIA CSRs) and Ssaia (S-mode > AIA CSRs). > > Refer, section 1.6 of the latest AIA v0.3.1 stable specification at > https://github.com/riscv/riscv-aia/releases/download/0.3.1-draft.32/riscv-interrupts-032.pdf) > > Based on above, we update QEMU RISC-V to: > 1) Have separate config options for Smaia and Ssaia extensions >which replace RISCV_FEATURE_AIA in CPU features > 2) Not generate AIA INTC compatible string in virt machine > > Signed-off-by: Anup Patel > Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis Alistair > --- > Changes since v2: > - Use env_archcpu() to get RISCVCPU * from CPURISCVState * > Changes since v1: > - Remove redundant "has_aia" parameter from riscv_cpu_pending_to_irq() > --- > hw/intc/riscv_imsic.c | 4 +++- > hw/riscv/virt.c | 13 ++--- > target/riscv/cpu.c| 9 - > target/riscv/cpu.h| 4 ++-- > target/riscv/cpu_helper.c | 3 ++- > target/riscv/csr.c| 24 ++-- > 6 files changed, 31 insertions(+), 26 deletions(-) > > diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c > index 8615e4cc1d..4d4d5b50ca 100644 > --- a/hw/intc/riscv_imsic.c > +++ b/hw/intc/riscv_imsic.c > @@ -344,9 +344,11 @@ static void riscv_imsic_realize(DeviceState *dev, Error > **errp) > > /* Force select AIA feature and setup CSR read-modify-write callback */ > if (env) { > -riscv_set_feature(env, RISCV_FEATURE_AIA); > if (!imsic->mmode) { > +rcpu->cfg.ext_ssaia = true; > riscv_cpu_set_geilen(env, imsic->num_pages - 1); > +} else { > +rcpu->cfg.ext_smaia = true; > } > riscv_cpu_set_aia_ireg_rmw_fn(env, (imsic->mmode) ? PRV_M : PRV_S, >riscv_imsic_rmw, imsic); > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index e779d399ae..b041b33afc 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -261,17 +261,8 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, > int socket, > qemu_fdt_add_subnode(mc->fdt, intc_name); > qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle", > intc_phandles[cpu]); > -if (riscv_feature(&s->soc[socket].harts[cpu].env, > - RISCV_FEATURE_AIA)) { > -static const char * const compat[2] = { > -"riscv,cpu-intc-aia", "riscv,cpu-intc" > -}; > -qemu_fdt_setprop_string_array(mc->fdt, intc_name, "compatible", > - (char **)&compat, ARRAY_SIZE(compat)); > -} else { > -qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", > -"riscv,cpu-intc"); > -} > +qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", > +"riscv,cpu-intc"); > qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, > 0); > qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1); > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index d3fbaa..3cf0c86661 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -101,6 +101,8 @@ static const struct isa_ext_data isa_edata_arr[] = { > ISA_EXT_DATA_ENTRY(zve64f, true, PRIV_VERSION_1_12_0, ext_zve64f), > ISA_EXT_DATA_ENTRY(zhinx, true, PRIV_VERSION_1_12_0, ext_zhinx), > ISA_EXT_DATA_ENTRY(zhinxmin, true, PRIV_VERSION_1_12_0, ext_zhinxmin), > +ISA_EXT_DATA_ENTRY(smaia, true, PRIV_VERSION_1_12_0, ext_smaia), > +ISA_EXT_DATA_ENTRY(ssaia, true, PRIV_VERSION_1_12_0, ext_ssaia), > ISA_EXT_DATA_ENTRY(sscofpmf, true, PRIV_VERSION_1_12_0, ext_sscofpmf), > ISA_EXT_DATA_ENTRY(sstc, true, PRIV_VERSION_1_12_0, ext_sstc), > ISA_EXT_DATA_ENTRY(svinval, true, PRIV_VERSION_1_12_0, ext_svinval), > @@ -669,10 +671,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > } > } > > -if (cpu->cfg.aia) { > -riscv_set_feature(env, RISCV_FEATURE_AIA); > -} > - > if (cpu->cfg.debug) { > riscv_set_feature(env, RISCV_FEATURE_DEBUG); > } > @@ -1058,7 +1056,8 @@ static Property riscv_cpu_extensions[] = { > DEFINE_PROP_BOOL("x-j", RISCVCPU, cfg.ext_j, false), > /* ePMP 0.9.3 */ > DEFINE_PROP_BOOL("x-epmp", RISCVCPU, cfg.epmp, false), > -DEFINE_PROP_BOOL("x-aia", RISCVCPU, cfg.aia, false), > +DEFINE_PROP_BOOL("x-smaia", RISCVCPU, cfg.ext_smaia, false), > +DEFINE_PROP_BOOL("x-ssaia", RISCVCPU, cfg.ext_ssaia, false), > > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 42edfa4558..15cad73def 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -85,7 +85,6 @@ enum { > RISCV_FEATURE_PMP, > RISCV_FEATURE_EPMP, > RISCV_FEATURE_MISA, > -RISCV_FEA
Re: [PATCH v3] target/riscv: Use official extension names for AIA CSRs
On Sat, Aug 20, 2022 at 2:30 PM Anup Patel wrote: > > The arch review of AIA spec is completed and we now have official > extension names for AIA: Smaia (M-mode AIA CSRs) and Ssaia (S-mode > AIA CSRs). > > Refer, section 1.6 of the latest AIA v0.3.1 stable specification at > https://github.com/riscv/riscv-aia/releases/download/0.3.1-draft.32/riscv-interrupts-032.pdf) > > Based on above, we update QEMU RISC-V to: > 1) Have separate config options for Smaia and Ssaia extensions >which replace RISCV_FEATURE_AIA in CPU features > 2) Not generate AIA INTC compatible string in virt machine > > Signed-off-by: Anup Patel > Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis Alistair > --- > Changes since v2: > - Use env_archcpu() to get RISCVCPU * from CPURISCVState * > Changes since v1: > - Remove redundant "has_aia" parameter from riscv_cpu_pending_to_irq() > --- > hw/intc/riscv_imsic.c | 4 +++- > hw/riscv/virt.c | 13 ++--- > target/riscv/cpu.c| 9 - > target/riscv/cpu.h| 4 ++-- > target/riscv/cpu_helper.c | 3 ++- > target/riscv/csr.c| 24 ++-- > 6 files changed, 31 insertions(+), 26 deletions(-) > > diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c > index 8615e4cc1d..4d4d5b50ca 100644 > --- a/hw/intc/riscv_imsic.c > +++ b/hw/intc/riscv_imsic.c > @@ -344,9 +344,11 @@ static void riscv_imsic_realize(DeviceState *dev, Error > **errp) > > /* Force select AIA feature and setup CSR read-modify-write callback */ > if (env) { > -riscv_set_feature(env, RISCV_FEATURE_AIA); > if (!imsic->mmode) { > +rcpu->cfg.ext_ssaia = true; > riscv_cpu_set_geilen(env, imsic->num_pages - 1); > +} else { > +rcpu->cfg.ext_smaia = true; > } > riscv_cpu_set_aia_ireg_rmw_fn(env, (imsic->mmode) ? PRV_M : PRV_S, >riscv_imsic_rmw, imsic); > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index e779d399ae..b041b33afc 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -261,17 +261,8 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, > int socket, > qemu_fdt_add_subnode(mc->fdt, intc_name); > qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle", > intc_phandles[cpu]); > -if (riscv_feature(&s->soc[socket].harts[cpu].env, > - RISCV_FEATURE_AIA)) { > -static const char * const compat[2] = { > -"riscv,cpu-intc-aia", "riscv,cpu-intc" > -}; > -qemu_fdt_setprop_string_array(mc->fdt, intc_name, "compatible", > - (char **)&compat, ARRAY_SIZE(compat)); > -} else { > -qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", > -"riscv,cpu-intc"); > -} > +qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", > +"riscv,cpu-intc"); > qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, > 0); > qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1); > > diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c > index d3fbaa..3cf0c86661 100644 > --- a/target/riscv/cpu.c > +++ b/target/riscv/cpu.c > @@ -101,6 +101,8 @@ static const struct isa_ext_data isa_edata_arr[] = { > ISA_EXT_DATA_ENTRY(zve64f, true, PRIV_VERSION_1_12_0, ext_zve64f), > ISA_EXT_DATA_ENTRY(zhinx, true, PRIV_VERSION_1_12_0, ext_zhinx), > ISA_EXT_DATA_ENTRY(zhinxmin, true, PRIV_VERSION_1_12_0, ext_zhinxmin), > +ISA_EXT_DATA_ENTRY(smaia, true, PRIV_VERSION_1_12_0, ext_smaia), > +ISA_EXT_DATA_ENTRY(ssaia, true, PRIV_VERSION_1_12_0, ext_ssaia), > ISA_EXT_DATA_ENTRY(sscofpmf, true, PRIV_VERSION_1_12_0, ext_sscofpmf), > ISA_EXT_DATA_ENTRY(sstc, true, PRIV_VERSION_1_12_0, ext_sstc), > ISA_EXT_DATA_ENTRY(svinval, true, PRIV_VERSION_1_12_0, ext_svinval), > @@ -669,10 +671,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error > **errp) > } > } > > -if (cpu->cfg.aia) { > -riscv_set_feature(env, RISCV_FEATURE_AIA); > -} > - > if (cpu->cfg.debug) { > riscv_set_feature(env, RISCV_FEATURE_DEBUG); > } > @@ -1058,7 +1056,8 @@ static Property riscv_cpu_extensions[] = { > DEFINE_PROP_BOOL("x-j", RISCVCPU, cfg.ext_j, false), > /* ePMP 0.9.3 */ > DEFINE_PROP_BOOL("x-epmp", RISCVCPU, cfg.epmp, false), > -DEFINE_PROP_BOOL("x-aia", RISCVCPU, cfg.aia, false), > +DEFINE_PROP_BOOL("x-smaia", RISCVCPU, cfg.ext_smaia, false), > +DEFINE_PROP_BOOL("x-ssaia", RISCVCPU, cfg.ext_ssaia, false), > > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 42edfa4558..15cad73def 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -85,7 +85,6 @@ enum { > RISCV_FEATURE_PMP, > RISCV_FEATURE_EPMP, > RISCV_FEATURE_MISA, > -RISCV_FEA
[PATCH v3] target/riscv: Use official extension names for AIA CSRs
The arch review of AIA spec is completed and we now have official extension names for AIA: Smaia (M-mode AIA CSRs) and Ssaia (S-mode AIA CSRs). Refer, section 1.6 of the latest AIA v0.3.1 stable specification at https://github.com/riscv/riscv-aia/releases/download/0.3.1-draft.32/riscv-interrupts-032.pdf) Based on above, we update QEMU RISC-V to: 1) Have separate config options for Smaia and Ssaia extensions which replace RISCV_FEATURE_AIA in CPU features 2) Not generate AIA INTC compatible string in virt machine Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- Changes since v2: - Use env_archcpu() to get RISCVCPU * from CPURISCVState * Changes since v1: - Remove redundant "has_aia" parameter from riscv_cpu_pending_to_irq() --- hw/intc/riscv_imsic.c | 4 +++- hw/riscv/virt.c | 13 ++--- target/riscv/cpu.c| 9 - target/riscv/cpu.h| 4 ++-- target/riscv/cpu_helper.c | 3 ++- target/riscv/csr.c| 24 ++-- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c index 8615e4cc1d..4d4d5b50ca 100644 --- a/hw/intc/riscv_imsic.c +++ b/hw/intc/riscv_imsic.c @@ -344,9 +344,11 @@ static void riscv_imsic_realize(DeviceState *dev, Error **errp) /* Force select AIA feature and setup CSR read-modify-write callback */ if (env) { -riscv_set_feature(env, RISCV_FEATURE_AIA); if (!imsic->mmode) { +rcpu->cfg.ext_ssaia = true; riscv_cpu_set_geilen(env, imsic->num_pages - 1); +} else { +rcpu->cfg.ext_smaia = true; } riscv_cpu_set_aia_ireg_rmw_fn(env, (imsic->mmode) ? PRV_M : PRV_S, riscv_imsic_rmw, imsic); diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index e779d399ae..b041b33afc 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -261,17 +261,8 @@ static void create_fdt_socket_cpus(RISCVVirtState *s, int socket, qemu_fdt_add_subnode(mc->fdt, intc_name); qemu_fdt_setprop_cell(mc->fdt, intc_name, "phandle", intc_phandles[cpu]); -if (riscv_feature(&s->soc[socket].harts[cpu].env, - RISCV_FEATURE_AIA)) { -static const char * const compat[2] = { -"riscv,cpu-intc-aia", "riscv,cpu-intc" -}; -qemu_fdt_setprop_string_array(mc->fdt, intc_name, "compatible", - (char **)&compat, ARRAY_SIZE(compat)); -} else { -qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", -"riscv,cpu-intc"); -} +qemu_fdt_setprop_string(mc->fdt, intc_name, "compatible", +"riscv,cpu-intc"); qemu_fdt_setprop(mc->fdt, intc_name, "interrupt-controller", NULL, 0); qemu_fdt_setprop_cell(mc->fdt, intc_name, "#interrupt-cells", 1); diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d3fbaa..3cf0c86661 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -101,6 +101,8 @@ static const struct isa_ext_data isa_edata_arr[] = { ISA_EXT_DATA_ENTRY(zve64f, true, PRIV_VERSION_1_12_0, ext_zve64f), ISA_EXT_DATA_ENTRY(zhinx, true, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, true, PRIV_VERSION_1_12_0, ext_zhinxmin), +ISA_EXT_DATA_ENTRY(smaia, true, PRIV_VERSION_1_12_0, ext_smaia), +ISA_EXT_DATA_ENTRY(ssaia, true, PRIV_VERSION_1_12_0, ext_ssaia), ISA_EXT_DATA_ENTRY(sscofpmf, true, PRIV_VERSION_1_12_0, ext_sscofpmf), ISA_EXT_DATA_ENTRY(sstc, true, PRIV_VERSION_1_12_0, ext_sstc), ISA_EXT_DATA_ENTRY(svinval, true, PRIV_VERSION_1_12_0, ext_svinval), @@ -669,10 +671,6 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) } } -if (cpu->cfg.aia) { -riscv_set_feature(env, RISCV_FEATURE_AIA); -} - if (cpu->cfg.debug) { riscv_set_feature(env, RISCV_FEATURE_DEBUG); } @@ -1058,7 +1056,8 @@ static Property riscv_cpu_extensions[] = { DEFINE_PROP_BOOL("x-j", RISCVCPU, cfg.ext_j, false), /* ePMP 0.9.3 */ DEFINE_PROP_BOOL("x-epmp", RISCVCPU, cfg.epmp, false), -DEFINE_PROP_BOOL("x-aia", RISCVCPU, cfg.aia, false), +DEFINE_PROP_BOOL("x-smaia", RISCVCPU, cfg.ext_smaia, false), +DEFINE_PROP_BOOL("x-ssaia", RISCVCPU, cfg.ext_ssaia, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 42edfa4558..15cad73def 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -85,7 +85,6 @@ enum { RISCV_FEATURE_PMP, RISCV_FEATURE_EPMP, RISCV_FEATURE_MISA, -RISCV_FEATURE_AIA, RISCV_FEATURE_DEBUG }; @@ -452,6 +451,8 @@ struct RISCVCPUConfig { bool ext_zve64f; bool ext_zmmul; bool ext_sscofpmf; +bool ext_smaia; +bool ext_ssaia; bool rvv_ta_all_1s; bool rvv_ma_all_1s; @@ -472,7 +473,6 @@ struct RISCVCPUConfig { bool mmu; bool pm