Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge from CV32E40X #404

Merged

Conversation

silabs-oysteink
Copy link
Contributor

  • Removal of mclicbase
  • Relocation of mintstatus
  • Updated handling of debug_cause
  • (partly) fix for signaling exception for ebreak with dcsr.ebreakm==0 only

A new merge will be done shortly which will add privilege level checks to the exception detection for ebreaks. This will better align the sources between X and S and enable a full fix on e40s for the exception/ebreak depending on dcsr.ebrakm and dcsr.ebreaku.

silabs-oysteink and others added 12 commits February 3, 2023 14:52
Not SEC clean as there is a difference when an exception trigger is enabled. Old cold would get an exception trigger that caused debug entry while new code would not get an exception and enter debug with cause=ebreak.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…not-exception

Not flagging exception for ebreak if dcsr.ebreakm==1.
…y logic into the FSM.

SEC clean.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…ld get the wrong debug_cause. This would happen if a synchronous debug reason was in WB at the same time, the taken NMI/interrupt would kill WB but that was not reflected in the debug cause.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…pt + single step.

SEC clean if an ebreak with dcsr.ebreakm is not flagged as an exception. Bugfix for not flagging ebreak as exception if dcsr.ebreakm is set will come in a separate PR.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…eted).

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…ingle step debug entry in the controller FSM.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…s, as mintstatus now is an MRO CSR.

Updated address for mintstatus in the csr.yaml.m4 file.

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
…k_merge-w6-1

Signed-off-by: Oystein Knauserud <Oystein.Knauserud@silabs.com>
@silabs-oysteink silabs-oysteink added the Component:RTL For issues in the RTL (e.g. for files in the rtl directory) label Feb 7, 2023
@Silabs-ArjanB Silabs-ArjanB merged commit adf3c78 into openhwgroup:master Feb 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component:RTL For issues in the RTL (e.g. for files in the rtl directory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants