target/riscv: Initial support for the Sdtrig extension via M-mode CSRs
v5 cover target/riscv: Initial support for the Sdtrig extension via M-mode CSRs
This adds initial support for the Sdtrig extension via the Trigger Module, as defined in the RISC-V Debug Specification [1].
Only "Address / Data Match" trigger (type 2) is implemented as of now, which is mainly used for hardware breakpoint and watchpoint. The number of type 2 triggers implemented is 2, which is the number that we can find in the SiFive U54/U74 cores.
[1] https://github.com/riscv/riscv-debug-spec/raw/master/riscv-debug-stable.pdf
Changes in v5:
- rebase against riscv-to-apply.next
- drop patch 1 in v4 which is already in riscv-to-apply.next
- adjust patch order to let patch 2 in v4 come later
Changes in v4:
- move riscv_trigger_init() call to riscv_cpu_reset()
Changes in v3:
- add riscv_trigger_init(), moved from patch #1 to this patch
- enable debug feature by default for all CPUs
Changes in v2:
- use 0 instead of GETPC()
- change the config option to 'disabled' by default
- new patch: add debug state description
Bin Meng (6):
target/riscv: debug: Implement debug related TCGCPUOps target/riscv: cpu: Add a config option for native debug target/riscv: csr: Hook debug CSR read/write target/riscv: machine: Add debug state description target/riscv: cpu: Enable native debug feature
hw/core: tcg-cpu-ops.h: Update comments of debug_check_watchpoint()
include/hw/core/tcg-cpu-ops.h | 1 + target/riscv/cpu.h | 4 +- target/riscv/debug.h | 6 ++ target/riscv/cpu.c | 12 ++++ target/riscv/csr.c | 57 +++++++++++++++++++ target/riscv/debug.c | 102 ++++++++++++++++++++++++++++++++++ target/riscv/machine.c | 32 +++++++++++ 7 files changed, 213 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
PATCH v5 1/6 target/riscv: debug: Implement debug related TCGCPUOps
From: Bin Meng <[email protected]>
Implement .debug_excp_handler, .debug_check_{breakpoint, watchpoint} TCGCPUOps and hook them into riscv_tcg_ops.
---
(no changes since v2)
Changes in v2:
- use 0 instead of GETPC()
target/riscv/debug.h | 4 +++ target/riscv/cpu.c | 3 ++ target/riscv/debug.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+)
target/riscv/debug.h +4 -0
@@ -105,4 +105,8 @@ void tselect_csr_write(CPURISCVState *env, target_ulong val);target_ulong tdata_csr_read (CPURISCVState *env,int tdata_index);void tdata_csr_write (CPURISCVState *env,int tdata_index,target_ulong val); +void riscv_cpu_debug_excp_handler (CPUState *cs); +bool riscv_cpu_debug_check_breakpoint (CPUState *cs); +bool riscv_cpu_debug_check_watchpoint (CPUState *cs,CPUWatchpoint *wp); +#endif /* RISCV_DEBUG_H */
target/riscv/cpu.c +3 -0
@@ -880,6 +880,9 @@ static const struct TCGCPUOps riscv_tcg_ops = { .do_interrupt = riscv_cpu_do_interrupt, .do_transaction_failed = riscv_cpu_do_transaction_failed, .do_unaligned_access = riscv_cpu_do_unaligned_access, + .debug_excp_handler = riscv_cpu_debug_excp_handler, + .debug_check_breakpoint = riscv_cpu_debug_check_breakpoint, + .debug_check_watchpoint = riscv_cpu_debug_check_watchpoint,#endif /* !CONFIG_USER_ONLY */ };
target/riscv/debug.c +75 -0
78 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v5 2/6 target/riscv: cpu: Add a config option for native debug
In reply to Bin MengFrom: Bin Meng <[email protected]>
Add a config option to enable support for native M-mode debug. This is disabled by default and can be enabled with 'debug=true'.
---
(no changes since v2)
Changes in v2:
- change the config option to 'disabled' by default
target/riscv/cpu.h | 4 +++- target/riscv/cpu.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-)
target/riscv/cpu.h +3 -1
@@ -79,7 +79,8 @@ enum {RISCV_FEATURE_PMP ,RISCV_FEATURE_EPMP ,RISCV_FEATURE_MISA , - RISCV_FEATURE_AIA +RISCV_FEATURE_AIA , + RISCV_FEATURE_DEBUG };/* Privileged specification version */
@@ -405,6 +406,7 @@ struct RISCVCPUConfig {bool pmp;bool epmp;bool aia; +bool debug;uint64_t resetvec; };
target/riscv/cpu.c +5 -0
@@ -548,6 +548,10 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp)riscv_set_feature (env,RISCV_FEATURE_AIA ); } +if (cpu->cfg.debug) { +riscv_set_feature (env,RISCV_FEATURE_DEBUG ); + } +set_resetvec (env, cpu->cfg.resetvec);/* Validate that MISA_MXL is set properly. */
@@ -795,6 +799,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("Zve64f" ,RISCVCPU , cfg.ext_zve64f, false),DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true), +DEFINE_PROP_BOOL ("debug" ,RISCVCPU , cfg.debug, false),DEFINE_PROP_STRING ("priv_spec" ,RISCVCPU , cfg.priv_spec), DEFINE_PROP_STRING("vext_spec", RISCVCPU, cfg.vext_spec),
Signature · 1 line
2.25.1
PATCH v5 3/6 target/riscv: csr: Hook debug CSR read/write
In reply to Bin MengFrom: Bin Meng <[email protected]>
This adds debug CSR read/write support to the RISC-V CSR RW table.
---
(no changes since v4)
Changes in v4:
- move riscv_trigger_init() call to riscv_cpu_reset()
Changes in v3:
- add riscv_trigger_init(), moved from patch #1 to this patch
target/riscv/debug.h | 2 ++ target/riscv/cpu.c | 4 ++++ target/riscv/csr.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 27 +++++++++++++++++++++ 4 files changed, 90 insertions(+)
target/riscv/debug.h +2 -0
@@ -109,4 +109,6 @@ void riscv_cpu_debug_excp_handler(CPUState *cs);bool riscv_cpu_debug_check_breakpoint (CPUState *cs);bool riscv_cpu_debug_check_watchpoint (CPUState *cs,CPUWatchpoint *wp); +void riscv_trigger_init (CPURISCVState *env); +#endif /* RISCV_DEBUG_H */
target/riscv/cpu.c +4 -0
@@ -466,6 +466,10 @@ static void riscv_cpu_reset(DeviceState *dev)set_default_nan_mode (1 , &env->fp_status);#ifndef CONFIG_USER_ONLY +if (riscv_feature (env,RISCV_FEATURE_DEBUG )) { +riscv_trigger_init (env); + } +if (kvm_enabled ()) {kvm_riscv_reset_vcpu (cpu); }
target/riscv/csr.c +57 -0
75 lines not on this page · raw message
target/riscv/debug.c +27 -0
@@ -412,3 +412,30 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, CPUWatchpoint *wp)return false; } + +void riscv_trigger_init (CPURISCVState *env) +{ +target_ulong type2 =trigger_type (env,TRIGGER_TYPE_AD_MATCH ); +int i; + +/* type 2 triggers */ +for (i =0 ; i <TRIGGER_TYPE2_NUM ; i++) { +/* +* type = TRIGGER_TYPE_AD_MATCH +* dmode = 0 (both debug and M-mode can write tdata) +* maskmax = 0 (unimplemented, always 0) +* sizehi = 0 (match against any size, RV64 only) +* hit = 0 (unimplemented, always 0) +* select = 0 (always 0, perform match on address) +* timing = 0 (always 0, trigger before instruction) +* sizelo = 0 (match against any size) +* action = 0 (always 0, raise a breakpoint exception) +* chain = 0 (unimplemented, always 0) +* match = 0 (always 0, when any compare value equals tdata2) +*/ + env->type2_trig[i].mcontrol = type2; + env->type2_trig[i].maddress =0 ; + env->type2_trig[i].bp =NULL ; + env->type2_trig[i].wp =NULL ; + } +}
Signature · 1 line
2.25.1
PATCH v5 4/6 target/riscv: machine: Add debug state description
In reply to Bin MengFrom: Bin Meng <[email protected]>
Add a subsection to machine.c to migrate debug CSR state.
---
(no changes since v2)
Changes in v2:
- new patch: add debug state description
target/riscv/machine.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
target/riscv/machine.c +32 -0
@@ -216,7 +216,38 @@ static const VMStateDescription vmstate_kvmtimer = {VMSTATE_UINT64 (env.kvm_timer_time,RISCVCPU ),VMSTATE_UINT64 (env.kvm_timer_compare,RISCVCPU ),VMSTATE_UINT64 (env.kvm_timer_state,RISCVCPU ), + VMSTATE_END_OF_LIST() + } +}; + +static bool debug_needed (void *opaque) +{ +RISCVCPU *cpu = opaque; +CPURISCVState *env = &cpu->env; + +return riscv_feature (env,RISCV_FEATURE_DEBUG ); +} +static const VMStateDescription vmstate_debug_type2 = { + .name ="cpu/debug/type2" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINTTL (mcontrol, type2_trigger_t), +VMSTATE_UINTTL (maddress, type2_trigger_t), +VMSTATE_END_OF_LIST () + } +}; + +static const VMStateDescription vmstate_debug = { + .name ="cpu/debug" , + .version_id =1 , + .minimum_version_id =1 , + .needed = debug_needed, + .fields = (VMStateField []) { +VMSTATE_UINTTL (env.trigger_cur,RISCVCPU ), +VMSTATE_STRUCT_ARRAY (env.type2_trig,RISCVCPU ,TRIGGER_TYPE2_NUM , +0 , vmstate_debug_type2, type2_trigger_t),VMSTATE_END_OF_LIST () } };
@@ -315,6 +346,7 @@ const VMStateDescription vmstate_riscv_cpu = { &vmstate_rv128, &vmstate_kvmtimer, &vmstate_envcfg, + &vmstate_debug, NULL } };
Signature · 1 line
2.25.1
PATCH v5 5/6 target/riscv: cpu: Enable native debug feature
In reply to Bin MengFrom: Bin Meng <[email protected]>
Turn on native debug feature by default for all CPUs.
---
(no changes since v3)
Changes in v3:
- enable debug feature by default for all CPUs
target/riscv/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu.c +1 -1
@@ -803,7 +803,7 @@ static Property riscv_cpu_properties[] = {DEFINE_PROP_BOOL ("Zve64f" ,RISCVCPU , cfg.ext_zve64f, false),DEFINE_PROP_BOOL ("mmu" ,RISCVCPU , cfg.mmu, true),DEFINE_PROP_BOOL ("pmp" ,RISCVCPU , cfg.pmp, true), -DEFINE_PROP_BOOL ("debug" ,RISCVCPU , cfg.debug, false), +DEFINE_PROP_BOOL ("debug" ,RISCVCPU , cfg.debug, true),DEFINE_PROP_STRING ("priv_spec" ,RISCVCPU , cfg.priv_spec), DEFINE_PROP_STRING("vext_spec", RISCVCPU, cfg.vext_spec),
Signature · 1 line
2.25.1
PATCH v5 6/6 hw/core: tcg-cpu-ops.h: Update comments of debug_check_watchpoint()
In reply to Bin MengFrom: Bin Meng <[email protected]>
This is now used by RISC-V as well. Update the comments.
---
(no changes since v1)
include/hw/core/tcg-cpu-ops.h | 1 + 1 file changed, 1 insertion(+)
include/hw/core/tcg-cpu-ops.h +1 -0
@@ -90,6 +90,7 @@ struct TCGCPUOps {/** * @debug_check_watchpoint: return true if the architectural * watchpoint whose address has matched should really fire, used by ARM +* and RISC-V */ bool (*debug_check_watchpoint)(CPUState *cpu,CPUWatchpoint *wp);
Signature · 1 line
2.25.1
Alistair Francis
AppliedQuoted 29 lines · Bin Meng
This adds initial support for the Sdtrig extension via the Trigger Module, as defined in the RISC-V Debug Specification [1].
Only "Address / Data Match" trigger (type 2) is implemented as of now, which is mainly used for hardware breakpoint and watchpoint. The number of type 2 triggers implemented is 2, which is the number that we can find in the SiFive U54/U74 cores.
[1] https://github.com/riscv/riscv-debug-spec/raw/master/riscv-debug-stable.pdf
Changes in v5:
- rebase against riscv-to-apply.next
- drop patch 1 in v4 which is already in riscv-to-apply.next
- adjust patch order to let patch 2 in v4 come laterChanges in v4:
- moveriscv_trigger_init()call toriscv_cpu_reset()Changes in v3:
- addriscv_trigger_init(), moved from patch #1 to this patch
- enable debug feature by default for all CPUsChanges in v2:
- use 0 instead ofGETPC()
- change the config option to 'disabled' by default
- new patch: add debug state description
Quoted 7 lines
Bin Meng (6):
target/riscv: debug: Implement debug related TCGCPUOps target/riscv: cpu: Add a config option for native debug target/riscv: csr: Hook debug CSR read/write target/riscv: machine: Add debug state description target/riscv: cpu: Enable native debug feature
hw/core:tcg-cpu-ops.h: Update comments ofdebug_check_watchpoint()
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 14 lines
include/hw/core/tcg-cpu-ops.h | 1 + target/riscv/cpu.h | 4 +- target/riscv/debug.h | 6 ++ target/riscv/cpu.c | 12 ++++ target/riscv/csr.c | 57 +++++++++++++++++++ target/riscv/debug.c | 102 ++++++++++++++++++++++++++++++++++ target/riscv/machine.c | 32 +++++++++++ 7 files changed, 213 insertions(+), 1 deletion(-)--
2.25.1