target/riscv: Use official extension names for AIA CSRs
PATCH 1/1 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
--- 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 | 30 ++++++++++++++++++++++-------- target/riscv/csr.c | 30 ++++++++++++++++++++++++------ 6 files changed, 57 insertions(+), 33 deletions(-)
hw/intc/riscv_imsic.c +3 -1
@@ -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);
hw/riscv/virt.c +2 -11
@@ -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 );
target/riscv/cpu.c +4 -5
@@ -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(), };
target/riscv/cpu.h +2 -2
@@ -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 pmp;bool epmp; -bool aia;bool debug;uint64_t resetvec;
target/riscv/cpu_helper.c +22 -8
@@ -305,7 +305,7 @@ uint8_t riscv_cpu_default_priority(int irq)return default_iprio[irq] ? default_iprio[irq] :IPRIO_MMAXIPRIO ; }; -static int riscv_cpu_pending_to_irq (CPURISCVState *env, +static int riscv_cpu_pending_to_irq (CPURISCVState *env,bool has_aia,int extirq,unsigned int extirq_def_prio,uint64_t pending,uint8_t *iprio) {
@@ -317,7 +317,7 @@ static int riscv_cpu_pending_to_irq(CPURISCVState *env, } irq =ctz64 (pending); -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +if (!has_aia) {return irq; }
@@ -354,34 +354,45 @@ uint64_t riscv_cpu_all_pending(CPURISCVState *env)int riscv_cpu_mirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & ~env->mideleg & ~(MIP_SGEIP |MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }int riscv_cpu_sirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & ~(MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }int riscv_cpu_vsirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & (MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio); }static int riscv_cpu_local_irq_pending (CPURISCVState *env) {int virq; +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs, pending, mie, hsie, vsie;/* Determine interrupt enable state of all privilege modes */
@@ -404,21 +415,24 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *env)/* Check M-mode interrupts */ irqs = pending & ~env->mideleg & -mie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }/* Check HS-mode interrupts */ irqs = pending & env->mideleg & ~env->hideleg & -hsie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }/* Check VS-mode interrupts */ irqs = pending & env->mideleg & env->hideleg & -vsie;if (irqs) { - virq =riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , + virq =riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio);return (virq <=0 ) ? virq : virq +1 ; }
target/riscv/csr.c +24 -6
@@ -181,7 +181,10 @@ static RISCVException any32(CPURISCVState *env, int csrno)static int aia_any (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }
@@ -190,7 +193,10 @@ static int aia_any(CPURISCVState *env, int csrno)static int aia_any32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }
@@ -217,7 +223,10 @@ static int smode32(CPURISCVState *env, int csrno)static int aia_smode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }
@@ -226,7 +235,10 @@ static int aia_smode(CPURISCVState *env, int csrno)static int aia_smode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }
@@ -282,7 +294,10 @@ static RISCVException pointer_masking(CPURISCVState *env, int csrno)static int aia_hmode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }
@@ -291,7 +306,10 @@ static int aia_hmode(CPURISCVState *env, int csrno)static int aia_hmode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }
Signature · 1 line
2.34.1
Quoted 132 lines · Anup Patel
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 replaceRISCV_FEATURE_AIAin CPU features
2) Not generate AIA INTC compatible string in virt machineSigned-off-by Anup Patel <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- 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 | 30 ++++++++++++++++++++++-------- target/riscv/csr.c | 30 ++++++++++++++++++++++++------ 6 files changed, 57 insertions(+), 33 deletions(-)hw/intc/riscv_imsic.c +3
-1@@ -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);hw/riscv/virt.c +2
-11@@ -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 );target/riscv/cpu.c +4
-5@@ -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(), };target/riscv/cpu.h +2
-2@@ -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 pmp;bool epmp; -bool aia;bool debug;uint64_t resetvec;target/riscv/cpu_helper.c +0
-0
target/riscv/cpu_helper.c uint8_t riscv_cpu_default_priority(int irq) · line 310
Quoted 7 lines
target/riscv/cpu_helper.c +1
-1@@ -305,7 +305,7 @@ uint8_t riscv_cpu_default_priority(int irq)return default_iprio[irq] ? default_iprio[irq] :IPRIO_MMAXIPRIO ; }; -static int riscv_cpu_pending_to_irq (CPURISCVState *env, +static int riscv_cpu_pending_to_irq (CPURISCVState *env,bool has_aia,int extirq,unsigned int extirq_def_prio,uint64_t pending,uint8_t *iprio)
It seems that we can get cpu->cfg.ext_smaia/cpu->cfg.ext_ssaia based on extirq directly from '*env' in
this function itself. If so, we can reuse the original code for following riscv_cpu_*irq_pending functions.
Regards,
Weiwei Li
Quoted 163 lines
target/riscv/cpu_helper.c +21
-7{@@ -317,7 +317,7 @@ static int riscv_cpu_pending_to_irq(CPURISCVState *env, } irq =ctz64 (pending); -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +if (!has_aia) {return irq; }@@ -354,34 +354,45 @@ uint64_t riscv_cpu_all_pending(CPURISCVState *env)int riscv_cpu_mirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & ~env->mideleg & ~(MIP_SGEIP |MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }int riscv_cpu_sirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & ~(MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }int riscv_cpu_vsirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & (MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio); }static int riscv_cpu_local_irq_pending (CPURISCVState *env) {int virq; +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs, pending, mie, hsie, vsie;/* Determine interrupt enable state of all privilege modes */ @@ -404,21 +415,24 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *env)/* Check M-mode interrupts */ irqs = pending & ~env->mideleg & -mie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }/* Check HS-mode interrupts */ irqs = pending & env->mideleg & ~env->hideleg & -hsie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }/* Check VS-mode interrupts */ irqs = pending & env->mideleg & env->hideleg & -vsie;if (irqs) { - virq =riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , + virq =riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio);return (virq <=0 ) ? virq : virq +1 ; }target/riscv/csr.c +24
-6@@ -181,7 +181,10 @@ static RISCVException any32(CPURISCVState *env, int csrno)static int aia_any (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -190,7 +193,10 @@ static int aia_any(CPURISCVState *env, int csrno)static int aia_any32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -217,7 +223,10 @@ static int smode32(CPURISCVState *env, int csrno)static int aia_smode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -226,7 +235,10 @@ static int aia_smode(CPURISCVState *env, int csrno)static int aia_smode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -282,7 +294,10 @@ static RISCVException pointer_masking(CPURISCVState *env, int csrno)static int aia_hmode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -291,7 +306,10 @@ static int aia_hmode(CPURISCVState *env, int csrno)static int aia_hmode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }
Quoted 146 lines · Weiwei Li
Quoted 132 lines · Anup Patel
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 replaceRISCV_FEATURE_AIAin CPU features
2) Not generate AIA INTC compatible string in virt machineSigned-off-by Anup Patel <[email protected]>Reviewed-by Andrew Jones <[email protected]>--- 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 | 30 ++++++++++++++++++++++-------- target/riscv/csr.c | 30 ++++++++++++++++++++++++------ 6 files changed, 57 insertions(+), 33 deletions(-)hw/intc/riscv_imsic.c +3
-1@@ -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);hw/riscv/virt.c +2
-11@@ -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 );target/riscv/cpu.c +4
-5@@ -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(), };target/riscv/cpu.h +2
-2@@ -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 pmp;bool epmp; -bool aia;bool debug;uint64_t resetvec;target/riscv/cpu_helper.c +0
-0target/riscv/cpu_helper.c uint8_t riscv_cpu_default_priority(int irq) · line 310
Quoted 7 lines
target/riscv/cpu_helper.c +1
-1@@ -305,7 +305,7 @@ uint8_t riscv_cpu_default_priority(int irq)return default_iprio[irq] ? default_iprio[irq] :IPRIO_MMAXIPRIO ; }; -static int riscv_cpu_pending_to_irq (CPURISCVState *env, +static int riscv_cpu_pending_to_irq (CPURISCVState *env,bool has_aia,int extirq,unsigned int extirq_def_prio,uint64_t pending,uint8_t *iprio)It seems that we can get cpu->cfg.ext_smaia/cpu->cfg.ext_ssaia based on extirq directly from '*env' in
Quoted 2 lines
this function itself. If so, we can reuse the original code for following riscv_cpu_*irq_pending functions.
I agree. I will send v2 soon.
Thanks,
Anup
Quoted 169 lines
Regards,
Weiwei Li
Quoted 163 lines
target/riscv/cpu_helper.c +21
-7{@@ -317,7 +317,7 @@ static int riscv_cpu_pending_to_irq(CPURISCVState *env, } irq =ctz64 (pending); -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +if (!has_aia) {return irq; }@@ -354,34 +354,45 @@ uint64_t riscv_cpu_all_pending(CPURISCVState *env)int riscv_cpu_mirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & ~env->mideleg & ~(MIP_SGEIP |MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }int riscv_cpu_sirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & ~(MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }int riscv_cpu_vsirq_pending (CPURISCVState *env) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs =riscv_cpu_all_pending (env) & env->mideleg & (MIP_VSSIP |MIP_VSTIP |MIP_VSEIP ); -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio); }static int riscv_cpu_local_irq_pending (CPURISCVState *env) {int virq; +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs);uint64_t irqs, pending, mie, hsie, vsie;/* Determine interrupt enable state of all privilege modes */ @@ -404,21 +415,24 @@ static int riscv_cpu_local_irq_pending(CPURISCVState *env)/* Check M-mode interrupts */ irqs = pending & ~env->mideleg & -mie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_M_EXT ,IPRIO_DEFAULT_M , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_smaia, +IRQ_M_EXT ,IPRIO_DEFAULT_M , irqs, env->miprio); }/* Check HS-mode interrupts */ irqs = pending & env->mideleg & ~env->hideleg & -hsie;if (irqs) { -return riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , +return riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs, env->siprio); }/* Check VS-mode interrupts */ irqs = pending & env->mideleg & env->hideleg & -vsie;if (irqs) { - virq =riscv_cpu_pending_to_irq (env,IRQ_S_EXT ,IPRIO_DEFAULT_S , + virq =riscv_cpu_pending_to_irq (env, cpu->cfg.ext_ssaia, +IRQ_S_EXT ,IPRIO_DEFAULT_S , irqs >>1 , env->hviprio);return (virq <=0 ) ? virq : virq +1 ; }target/riscv/csr.c +24
-6@@ -181,7 +181,10 @@ static RISCVException any32(CPURISCVState *env, int csrno)static int aia_any (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -190,7 +193,10 @@ static int aia_any(CPURISCVState *env, int csrno)static int aia_any32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_smaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -217,7 +223,10 @@ static int smode32(CPURISCVState *env, int csrno)static int aia_smode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -226,7 +235,10 @@ static int aia_smode(CPURISCVState *env, int csrno)static int aia_smode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -282,7 +294,10 @@ static RISCVException pointer_masking(CPURISCVState *env, int csrno)static int aia_hmode (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }@@ -291,7 +306,10 @@ static int aia_hmode(CPURISCVState *env, int csrno)static int aia_hmode32 (CPURISCVState *env,int csrno) { -if (!riscv_feature (env,RISCV_FEATURE_AIA )) { +CPUState *cs =env_cpu (env); +RISCVCPU *cpu =RISCV_CPU (cs); + +if (!cpu->cfg.ext_ssaia) {return RISCV_EXCP_ILLEGAL_INST ; }