trap on accesses to mcounteren or menvcfg - #335
Open
MikeOpenHWGroup wants to merge 1 commit into
Open
MikeOpenHWGroup wants to merge 1 commit into
MikeOpenHWGroup wants to merge 1 commit into
Conversation
MikeOpenHWGroup
requested review from
AlexChenIC,
IhsaneTahir,
cairo-caplan and
davideschiavone
and
a lite review from Copilot
September 5, 2026 18:06
There was a problem hiding this comment.
🟢 Approval recommended
The CSR read decode now correctly raises illegal-instruction traps for menvcfg(*) and mcounteren when U-mode is disabled, matching the stated requirement and existing illegal-CSR handling patterns.
Pull request overview
This PR updates CVE2’s CSR access behavior to match the RISC-V Privileged spec requirement that menvcfg/menvcfgh and mcounteren must be treated as non-existent (and therefore trap) when U-mode is not supported.
Changes:
- Make reads of
CSR_MENVCFG/CSR_MENVCFGHraiseillegal_csrwhenUmodeEnabled==0. - Make reads of
CSR_MCOUNTERENraiseillegal_csrwhenUmodeEnabled==0. - Add inline spec-referencing comments explaining the “CSR should not exist without U-mode” behavior.
File summaries
| File | Description |
|---|---|
| rtl/cve2_cs_registers.sv | Gates menvcfg(*) and mcounteren CSR reads on UmodeEnabled, trapping when U-mode is absent. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or 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
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.
The CVE2 does not support U-mode so access to
mcounterenormenvcfgshould throw an illegal instruction trap.This fix "works" and passes an extensive regression. However, it is very awkwardly implemented because we have only disabled the logic for U-mode, not removed it.