Added support for DBG_NUM_TRIGGERS parameter #700
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…module will not be instantiated and any access to trigger CSR will result in an illegal instruction. debug_triggers will instantiate DBG_NUM_TRIGGERS instances of tdata1 and tdata2 and perform instruction address match checks for any enabled triggers. Converted trigger type 2 (mcontrol) to 6 (mcontrol6) and updated trigger match to take EXECUTE and M bit into account. (Passed modified debug_trigger_test). Reset value for tdata1 is updated to reflect mcontrol6. Signed-off-by: Oystein Knauserud <[email protected]>
silabs-oysteink
added
the
Component:RTL
Silabs-ArjanB
requested changes
Nov 16, 2022
bhv/cv32e40x_wrapper.sv
Outdated
| @@ -560,13 +560,16 @@ endgenerate | |||
| .csr_mclicbase_n_i ( core_i.cs_registers_i.mclicbase_n ), | |||
| .csr_mclicbase_q_i ( core_i.cs_registers_i.mclicbase_rdata ), | |||
| .csr_mclicbase_we_i ( core_i.cs_registers_i.mclicbase_we ), | |||
| .csr_tdata1_n_i ( core_i.cs_registers_i.debug_triggers_i.tdata1_n ), | |||
| .csr_tdata1_n_i ( core_i.cs_registers_i.triggers.debug_triggers_i.tdata1_n ), // If DBG_NUM_TRIGGERS=0 this connection will fail | |||
There was a problem hiding this comment.
How will that get fixed? At least change into todo.
There was a problem hiding this comment.
Refactored code to always include debug_triggers and checking for DBG_NUM_TRIGGERS inside debug_triggers instead. Makes RVFI connection equal for any value of DBG_NUM_TRIGGERS.
rtl/cv32e40x_debug_triggers.sv
Outdated
|
|
||
| logic unused_signals; | ||
|
|
||
| // Write data | ||
| always_comb begin | ||
| tselect_n = tselect_rdata_o; // todo | ||
| // Tselect is WARL (0 -> DBG_NUM_TRIGGERS-1) | ||
| tselect_n = (csr_wdata_i < DBG_NUM_TRIGGERS) ? csr_wdata_i : (DBG_NUM_TRIGGERS - 1); |
There was a problem hiding this comment.
Resolution is not according to spec.
rtl/cv32e40x_debug_triggers.sv
Outdated
| assign tdata3_rdata_o = 32'h00000000; | ||
| assign tselect_rdata_o = 32'h00000000; | ||
| assign tselect_rdata_o = tselect_q; |
There was a problem hiding this comment.
Add todo on tinfo_rdata_o; it still need to be updated
There was a problem hiding this comment.
Added todo.
- Always including debug_triggers in cs_registers, not including logic if DBG_NUM_TRIGGERS=0. Makes RVFI connection easier. Signed-off-by: Oystein Knauserud <[email protected]>
Signed-off-by: Oystein Knauserud <[email protected]>
Silabs-ArjanB
approved these changes
Nov 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added support for DBG_NUM_TRIGGER parameter.If 0, the debug_triggers module will not be instantiated and any access to trigger CSR will result in an illegal instruction.
debug_triggers will instantiate DBG_NUM_TRIGGERS instances of tdata1 and tdata2 and perform instruction address match checks for any enabled triggers.
Converted trigger type 2 (mcontrol) to 6 (mcontrol6) and updated trigger match to take EXECUTE and M bit into account. (Passed modified debug_trigger_test). Reset value for tdata1 is updated to reflect mcontrol6.
Without the conversion of mcontrol -> mcontrol6, this PR is SEC clean when DBG_NUM_TRIGGERS=1.
Signed-off-by: Oystein Knauserud [email protected]