Fix for issues #365 and #361 on cv32e40s. #749
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
When waking up from sleep (exiting FSM state SLEEP), the cause of wakeup is now flopped to enable the FSM to take the action according to the wakeup reason, although there may be higher priority events appearing after the wakeup. Signed-off-by: Oystein Knauserud <[email protected]>
silabs-oysteink
added
the
Component:RTL
Silabs-ArjanB
requested changes
Jan 2, 2023
| assert property (@(posedge clk) disable iff (!rst_n) | ||
| (ctrl_fsm_cs == SLEEP) && | ||
| (ctrl_fsm_ns == FUNCTIONAL) && | ||
| !(pending_nmi || irq_wu_ctrl_i || (wfe_in_wb && wu_wfe_i)) |
There was a problem hiding this comment.
Wouldn't it be logical to add && debug_req_i here?
There was a problem hiding this comment.
Agreed, adding it
| (ctrl_fsm_cs == SLEEP) && | ||
| (ctrl_fsm_ns == FUNCTIONAL) && | ||
| !(pending_nmi || debug_req_i || (wfe_in_wb && wu_wfe_i)) && | ||
| mstatus_i.mie |
There was a problem hiding this comment.
&& irq_wu_ctrl_i seems more logical than the currently used && mstatus_i.mie
There was a problem hiding this comment.
Agree that it is logical to add the '&& irq_wu_ctrl_i'. mstatus.mie is still needed for this assertion as the core may wake up on a non-globally enabled interrupt. In that case no interrupt will be taken and the core continues ad PC+4.
| assert property (@(posedge clk) disable iff (!rst_n) | ||
| (ctrl_fsm_cs == SLEEP) && | ||
| (ctrl_fsm_ns == FUNCTIONAL) && | ||
| !(debug_req_i || irq_wu_ctrl_i || (wfe_in_wb && wu_wfe_i)) |
sva/cv32e40x_controller_fsm_sva.sv
Outdated
| !(pending_nmi || debug_req_i || (wfe_in_wb && wu_wfe_i)) && | ||
| mstatus_i.mie | ||
| |=> | ||
| (ctrl_fsm_o.irq_ack)) |
There was a problem hiding this comment.
Use pc_mux instead to make it similar to next assertion
There was a problem hiding this comment.
Changing to pc_mux comparisons.
Signed-off-by: Oystein Knauserud <[email protected]>
Silabs-ArjanB
approved these changes
Jan 2, 2023
This was referenced Jan 2, 2023
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.
When waking up from sleep (exiting FSM state SLEEP), the cause of wakeup is now flopped to enable the FSM to take the action according to the wakeup reason, although there may be higher priority events appearing after the wakeup.
Signed-off-by: Oystein Knauserud [email protected]