Skip to content

Re-integrate Smepmp #1879

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Re-integrate Smepmp #1879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2993397
Re-integrate Smepmp
mickflemm Mar 3, 2025
b1e943e
Resolve comments from reviewers
mickflemm Apr 14, 2025
6beef80
Merge branch 'main' into smepmp-cleanup
mickflemm Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/images/smepmp-visual-representation.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/wavedrom/mseccfg.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
....
{reg: [
{bits: 1, name: 'MML'},
{bits: 1, name: 'MMWP'},
{bits: 1, name: 'MMAP'},
{bits: 1, name: 'RLB'},
{bits: 5, name: 'WPRI'},
{bits: 1, name: 'USEED'},
Expand Down
13 changes: 7 additions & 6 deletions src/machine.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2246,10 +2246,10 @@ include::images/wavedrom/mseccfg.edn[]
The definitions of the SSEED and USEED fields are furnished by the
entropy-source extension, Zkr.

The definitions of the RLB, MMWP, and MML fields are furnished by the
PMP-enhancement extension, Smepmp.
The definitions of the RLB, MMAP, and MML fields are part of the Smepmp
extension, as defined in <<smepmp>>.
Copy link
Contributor

@Timmmm Timmmm Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just hyperlink "the Smepmp extension".

Suggested change
extension, as defined in <<smepmp>>.
The RLB, MMWP, and MML fields are defined in <<smepmp,the PMP-enhancement extension, Smepmp>>.


The definition of the PMM field is furnished by the Smmpm extension.
The definition of the PMM field is furnished by the Smmpm extension in <<Zpm>>.
Copy link
Contributor

@Timmmm Timmmm Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
The definition of the PMM field is furnished by the Smmpm extension in <<Zpm>>.
The PMM field is defined in <<Zpm,the Smmpm extension>>.


The Zicfilp extension adds the `MLPE` field in `mseccfg`. When `MLPE` field is
1, Zicfilp extension is enabled in M-mode. When the `MLPE` field is 0, the
Expand Down Expand Up @@ -2524,9 +2524,9 @@ as described in <<misa>>. For
implementations with the "A" standard extension, there is no valid
load reservation. The `pc` is set to an implementation-defined reset
vector. The `mcause` register is set to a value indicating the cause of
the reset. Writable PMP registers’ A and L fields are set to 0, unless
the platform mandates a different reset value for some PMP registers’ A
and L fields. If the hypervisor extension is implemented, the
the reset. Writable PMP registers’ A and L fields, and `mseccfg`.MML/MMAP/RLB
fields are set to 0, unless the platform mandates a pre-defined PMP ruleset.
Copy link
Contributor

@Timmmm Timmmm Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably needs a changelog entry?

If the hypervisor extension is implemented, the
`hgatp`.MODE and `vsatp`.MODE fields are reset to 0. If the Smrnmi
extension is implemented, the `mnstatus`.NMIE field is reset to 0. No
*WARL* field contains an illegal value. If the Zicfilp extension is
Expand Down Expand Up @@ -3226,6 +3226,7 @@ If the current XLEN is greater than MXLEN, the PMP address registers are
zero-extended from MXLEN to XLEN bits for the purposes of address
matching.

[[pmp-locking]]
===== Locking and Privilege Mode

The L bit indicates that the PMP entry is locked, i.e., writes to the
Expand Down
4 changes: 2 additions & 2 deletions src/riscv-privileged.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ Avižienis, Jacob Bachmeyer, Allen J. Baum, Jonathan Behrens, Paolo Bonzini, Rus
Christopher Celio, Chuanhua Chang, David Chisnall, Anthony Coulter, Palmer Dabbelt, Monte
Dalrymple, Paul Donahue, Greg Favor, Dennis Ferguson, Marc Gauthier, Andy Glew,
Gary Guo, Mike Frysinger, John Hauser, David Horner, Olof
Johansson, David Kruckemyer, Yunsup Lee, Daniel Lustig, Andrew Lutomirski, Martin Maas, Prashanth Mundkur,
Johansson, Nick Kossifidis, David Kruckemyer, Yunsup Lee, Daniel Lustig, Andrew Lutomirski, Martin Maas, Prashanth Mundkur,
Jonathan Neuschäfer, Rishiyur
Nikhil, Stefan O'Rear, Albert Ou, John Ousterhout, David Patterson, Dmitri
Pavlov, Kade Phillips, Josh Scheid, Colin Schmidt, Michael Taylor, Wesley Terpstra, Matt Thomas, Tommy Thorn, Ray
VanDeWalker, Megan Wachs, Steve Wallach, Andrew Waterman, Claire Wolf, Adam Zabrocki,
VanDeWalker, Megan Wachs, Steve Wallach, Andrew Waterman, Claire Wolf, Joe Xie, Adam Zabrocki,
and Reinoud Zandijk.._

_This document is released under a Creative Commons Attribution 4.0 International License._
Expand Down
Loading