PMP Assert - Fix CEXes #1636
Merged
PMP Assert - Fix CEXes #1636
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
Signed-off-by: Robin Pedersen <Robin.Pedersen@silabs.com>
Signed-off-by: Robin Pedersen <Robin.Pedersen@silabs.com>
Signed-off-by: Robin Pedersen <Robin.Pedersen@silabs.com>
silabs-robin
commented
Feb 9, 2023
| @@ -1,27 +1,48 @@ | |||
| // Copyright 2022 Silicon Labs, Inc. | |||
There was a problem hiding this comment.
Copyright header was missing.
| parameter int PMP_GRANULARITY = 0, | ||
| parameter int PMP_NUM_REGIONS = 0, | ||
| parameter int IS_INSTR_SIDE = 0, | ||
| parameter mseccfg_t MSECCFG_RESET_VAL = MSECCFG_DEFAULT |
There was a problem hiding this comment.
Tying this to "default" was just wrong.
| @@ -387,7 +411,7 @@ module uvmt_cv32e40s_pmp_assert | |||
| // U-mode fails if no match (vplan:UmodeNomatch) | |||
| a_nomatch_umode_fails: assert property ( | |||
| priv_lvl_i == PRIV_LVL_U && match_status.is_matched == 1'b0 |-> | |||
| pmp_req_err_o | |||
| pmp_req_err_o ^ match_status.is_dm_override | |||
There was a problem hiding this comment.
DM can now override PMP/PMA: https://docs.openhwgroup.org/projects/cv32e40s-user-manual/en/latest/debug.html
|
|
||
| end | ||
| match_status_o.is_rwx_ok = |match_status_o.val_access_allowed_reason; | ||
| end else begin // mmwp low |
There was a problem hiding this comment.
This code was indented one level too much, so it was difficult to scroll up/down and see which if-stmt clause the execution was in.
| .rvfi_valid (uvmt_cv32e40s_tb.dut_wrap.cv32e40s_wrapper_i.rvfi_i.rvfi_valid), | ||
| .rvfi_pc_rdata (uvmt_cv32e40s_tb.dut_wrap.cv32e40s_wrapper_i.rvfi_i.rvfi_pc_rdata), | ||
| u_pmp_assert_lsu(.rst_n (clknrst_if.reset_n), | ||
| .bus_trans_dbg (uvmt_cv32e40s_tb.dut_wrap.cv32e40s_wrapper_i.core_i.load_store_unit_i.mpu_i.bus_trans_o.dbg), |
There was a problem hiding this comment.
Note: This code trusts that the dbg value given to the MPU is correct in the core. Though, it should be verified by pmprvfi_assert when rvfi reports the "known" actual D-mode state and the PMP decisions are checked again.
silabs-hfegran
approved these changes
Feb 15, 2023
silabs-robin
pushed a commit
to silabs-robin/core-v-verif
that referenced
this pull request
Mar 31, 2023
PMP Assert - Fix CEXes
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.
This PR fixes some CEXes in the PMP asserts, mostly related to the new DM_REGION_START/END.
Passes in formal.
Passes ci_check (except debug_test) BUT ONLY AFTER #1631 IS MERGED.