-
Notifications
You must be signed in to change notification settings - Fork 41
Add Smstateen/Ssstateen Extension and CSRs #592
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
Merged
ThinkOpenly
merged 49 commits into
riscv-software-src:main
from
neverlandiz:add-smstateen-sstateen
Jun 10, 2025
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
6a3c81c
add smstateen/ssstateen CSRs
neverlandiz be264c6
Merge branch 'main' into add-smstateen-sstateen
neverlandiz f981030
lots of minor fixes
neverlandiz 4348f66
merging
neverlandiz f147046
merge
neverlandiz 601efbe
lots of backticks
neverlandiz a5108d2
minor fixes
neverlandiz 8bb0d30
modified descriptions
neverlandiz 0807a91
Merge branch 'main' into add-smstateen-sstateen
neverlandiz e5fa958
remove pre-commit-config.yaml from pr
neverlandiz fffabda
remove pre-commit file changes
neverlandiz daa12b4
Merge branch 'main' into add-smstateen-sstateen
neverlandiz 354ed45
add definedBy for fields
neverlandiz 9484789
add sw_write and sw_read for alias
neverlandiz 493e97c
add long names
neverlandiz 843c1c6
structured format descriptions
neverlandiz a3f75bb
finish adding structured format
neverlandiz f4c73f3
change mstateen* reset values to 0
neverlandiz de434ae
docs(stateen): comment out Zfinx & Zdinx code + add sw_read
neverlandiz d074a3e
docs(stateen): change C field description
neverlandiz 4321a85
Merge branch 'main' into add-smstateen-sstateen
neverlandiz efc3bff
docs(stateen): fix syntax errors
neverlandiz 659aa3a
docs(stateen): syntax
neverlandiz 405103b
docs(stateen): add sw_write for sstateen CSRs
neverlandiz 240b895
docs(stateen): add sw_write for hstateen* CSRs
neverlandiz 59a027a
Merge branch 'main' into add-smstateen-sstateen
neverlandiz 838355d
docs(stateen): syntax fixes
neverlandiz eb9b003
docs(stateen): syntax fixes
neverlandiz 5d4e1be
docs(stateen): more fixes
neverlandiz 3bc9359
docs(stateen): syntax fix
neverlandiz a439395
fix
neverlandiz 7dae65a
docs(stateen): add params to zcmt
neverlandiz a0d910c
docs(stateen): update fields based on newest specs
neverlandiz a73ea8e
docs(stateen): fix sw_write
neverlandiz c14d794
docs(stateen): add params for ext files
neverlandiz 7c06ae7
docs(stateen): sw_write fixes
neverlandiz c7bba1d
docs(stateen): add definedBy for some fields
neverlandiz d565997
docs(stateen): syntax fixes
neverlandiz 5e290b6
Merge branch 'main' into add-smstateen-sstateen
neverlandiz db8de99
Merge branch 'main' into add-smstateen-sstateen
neverlandiz 0cb9aa9
docs(stateen): fix CI failures
neverlandiz cdc8c2e
Merge branch 'main' into add-smstateen-sstateen
neverlandiz 6fb0fe9
docs(mstateen0): typo fix
neverlandiz cc5c669
docs(mstateen0): typo fix
neverlandiz 780876d
docs(stateen): change MXLEN to 64
neverlandiz aef6da9
docs(stateen): fix base
neverlandiz b7e7f70
docs(zcmt): fix Zcmt typo
neverlandiz 3d63bb4
Merge branch 'main' into add-smstateen-sstateen
neverlandiz 3d57b11
fix(stateen): fix ruby code bug
neverlandiz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,219 @@ | ||
# yaml-language-server: $schema=../../schemas/csr_schema.json | ||
|
||
$schema: "csr_schema.json#" | ||
kind: csr | ||
name: hstateen0 | ||
long_name: Hypervisor State Enable 0 Register | ||
address: 0x60C | ||
priv_mode: S | ||
length: 64 | ||
description: | ||
- id: csr-hstateen0-purpose | ||
normative: true | ||
text: | | ||
Each bit of a `stateen` CSR controls less-privileged access to an extension’s state, | ||
for an extension that was not deemed "worthy" of a full XS field in `sstatus` like the | ||
FS and VS fields for the F and V extensions. | ||
- id: csr-hstateen0-num-justification | ||
normative: false | ||
text: | | ||
The number of registers provided at each level is four because it is believed that | ||
4 * 64 = 256 bits for machine and hypervisor levels, and 4 * 32 = 128 bits for | ||
supervisor level, will be adequate for many years to come, perhaps for as long as | ||
the RISC-V ISA is in use. | ||
The exact number four is an attempted compromise between providing too few bits on | ||
the one hand and going overboard with CSRs that will never be used on the other. | ||
- id: csr-hstateen0-scope | ||
normative: true | ||
text: | | ||
The `stateen` registers at each level control access to state at all less-privileged | ||
levels, but not at its own level. | ||
- id: csr-hstateen0-effect | ||
normative: true | ||
text: | | ||
When a `stateen` CSR prevents access to state for a privilege mode, attempting to execute | ||
in that privilege mode an instruction that implicitly updates the state without reading | ||
it may or may not raise an illegal instruction or virtual instruction exception. | ||
Such cases must be disambiguated by being explicitly specified one way or the other. | ||
In some cases, the bits of the `stateen` CSRs will have a dual purpose as enables for the | ||
ISA extensions that introduce the controlled state. | ||
- id: csr-hstateen0-encodings | ||
normative: true | ||
text: | | ||
With the hypervisor extension, the `hstateen` CSRs have identical encodings to the `mstateen` CSRs, | ||
except controlling accesses for a virtual machine (from VS and VU modes). | ||
- id: csr-hstateen0-zero | ||
normative: true | ||
text: | | ||
For every bit in an `hstateen` CSR that is zero (whether read-only zero or set to zero), | ||
the same bit appears as read-only zero in `sstateen` when accessed in VS-mode. | ||
- id: csr-hstateen0-read-only | ||
normative: true | ||
text: | | ||
A bit in an `hstateen` CSR cannot be read-only one unless the same bit is read-only one | ||
in the matching `mstateen` CSR. | ||
|
||
definedBy: | ||
allOf: | ||
- H | ||
- Smstateen | ||
AFOliveira marked this conversation as resolved.
Show resolved
Hide resolved
|
||
- Ssstateen | ||
fields: | ||
SE0: | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
long_name: sstateen0 access control | ||
location: 63 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
description: | | ||
The SE0 bit in `hstateen0` controls access to the `sstateen0` CSR. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].SE0 == 1'b0){ | ||
return 0; | ||
} | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return csr_value.SE0; | ||
ENVCFG: | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
long_name: senvcfg access control | ||
location: 62 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
definedBy: | ||
name: S | ||
version: ">= 1.11" | ||
description: | | ||
The ENVCFG bit in `hstateen0` controls access to the `senvcfg` CSRs. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].ENVCFG == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.ENVCFG; | ||
CSRIND: | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
long_name: siselect and sireg* access control | ||
location: 60 | ||
definedBy: Sscsrind | ||
description: | | ||
The CSRIND bit in `hstateen0` controls access to the `siselect` and the | ||
`sireg*`, (really `vsiselect` and `vsireg*`) CSRs provided by the Sscsrind | ||
extensions. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CSRIND == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.CSRIND; | ||
AIA: | ||
long_name: Ssaia state access control | ||
location: 59 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
definedBy: Ssaia | ||
description: | | ||
The AIA bit in `hstateen0` controls access to all state introduced by | ||
the Ssaia extension and is not controlled by either the CSRIND or the | ||
IMSIC bits of `hstateen0`. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].AIA == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.AIA; | ||
IMSIC: | ||
long_name: IMSIC state access control | ||
location: 58 | ||
definedBy: Ssaia | ||
description: | | ||
The IMSIC bit in `hstateen0` controls access to the guest IMSIC state, | ||
including CSRs `stopei` (really `vstopei`), provided by the Ssaia extension. | ||
|
||
Setting the IMSIC bit in `hstateen0` to zero prevents a virtual machine | ||
from accessing the hart’s IMSIC the same as setting `hstatus.`VGEIN = 0. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].IMSIC == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.IMSIC; | ||
CONTEXT: | ||
long_name: scontext access control | ||
location: 57 | ||
definedBy: Sdtrig | ||
description: | | ||
The CONTEXT bit in `hstateen0` controls access to the `scontext` CSR provided | ||
by the Sdtrig extension. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CONTEXT == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.CONTEXT; | ||
CTR: | ||
long_name: ctr access control | ||
location: 54 | ||
description: | | ||
If the H extension is implemented and `mstateen0.CTR=1`, the `hstateen0.CTR` bit controls access to | ||
supervisor CTR state when V=1. This state includes `sctrctl` (really `vsctrctl`), `sctrstatus`, and `sireg*` | ||
(really `vsireg*`) when `siselect` (really `vsiselect`) is in 0x200..0x2FF. `hstateen0.CTR` is read-only 0 when | ||
`mstateen0.CTR=0`. | ||
type: RW | ||
reset_value: 0 | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CTR == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.CTR; | ||
JVT: | ||
long_name: jvt access control | ||
location: 2 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
definedBy: Zcmt | ||
description: | | ||
The JVT bit controls access to the `jvt` CSR provided by the Zcmt extension. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].JVT == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.JVT; | ||
FCSR: | ||
long_name: fcsr access control | ||
location: 1 | ||
#definedBy: | ||
#anyOf: [Zhinx, Zfinx, Zdinx] | ||
description: | | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
The FCSR bit controls access to `fcsr` for the case when floating-point instructions | ||
operate on `x` registers instead of `f` registers as specified by the Zfinx and related | ||
extensions (Zdinx, etc.). Whenever `misa.F` = 1, FCSR bit of `mstateen0` is read-only | ||
zero (and hence read-only zero in `hstateen0` and `sstateen0` too). For convenience, | ||
when the `stateen` CSRs are implemented and `misa.F` = 0, then if the FCSR bit of a | ||
controlling `stateen0` CSR is zero, all floating-point instructions cause an illegal | ||
instruction trap (or virtual instruction trap, if relevant), as though they all access | ||
`fcsr`, regardless of whether they really do. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].FCSR == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.FCSR; | ||
C: | ||
long_name: custom state access control | ||
location: 0 | ||
description: | | ||
The C bit controls access to any and all custom state. The C bit of these registers is | ||
not custom state itself; it is a standard field of a standard CSR, either `mstateen0`, | ||
`hstateen0`, or `sstateen0`. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].C == 1'b0){ | ||
return 0; | ||
} | ||
return csr_value.C; | ||
sw_read(): | | ||
# for every bit in an mstateen CSR that is zero, the same bit | ||
# appears as read-only zero in the matching hstateen CSR | ||
|
||
Bits<64> mstateen0_mask = $bits(CSR[mstateen0]); | ||
Bits<64> hstateen0_value = $bits(CSR[hstateen0]) & mstateen0_mask; | ||
return hstateen0_value; |
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
# yaml-language-server: $schema=../../schemas/csr_schema.json | ||
|
||
$schema: "csr_schema.json#" | ||
kind: csr | ||
name: hstateen0h | ||
long_name: Upper 32 bits of Hypervisor State Enable 0 Register | ||
address: 0x61C | ||
priv_mode: S | ||
length: 32 | ||
base: 32 | ||
description: | ||
- id: csr-hstateen0h-purpose | ||
normative: true | ||
text: | | ||
For RV64 harts, the Smstateen/Ssstateen extension adds four new 64-bit CSRs at machine level: `mstateen0` (Machine State Enable 0), | ||
`mstateen1`, `mstateen2`, and `mstateen3`. If supervisor mode is implemented, another four CSRs are defined at | ||
supervisor level: `sstateen0`, `sstateen1`, `sstateen2`, and `sstateen3`. And if the hypervisor extension is implemented, | ||
another set of CSRs is added: `hstateen0`, `hstateen1`, `hstateen2`, and `hstateen3`. | ||
|
||
For RV32, the registers listed above are 32-bit, and for the machine-level and hypervisor CSRs there is a corresponding | ||
set of high-half CSRs for the upper 32 bits of each register: `mstateen0h`, `mstateen1h`, `mstateen2h`, `mstateen3h`, `hstateen0h`, | ||
`hstateen1h`, `hstateen2h`, and `hstateen3h`. | ||
|
||
definedBy: | ||
allOf: | ||
- H | ||
- Smstateen | ||
- Ssstateen | ||
fields: | ||
SE0: | ||
long_name: sstateen0 access control | ||
location: 31 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
alias: hstateen0.SE0 | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].SE0 == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].SE0 = csr_value.SE0; | ||
return csr_value.SE0; | ||
description: | | ||
The SE0 bit in `hstateen0h` controls access to the `sstateen0` CSR. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
ENVCFG: | ||
long_name: senvcfg access control | ||
location: 30 | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
definedBy: | ||
name: S | ||
version: ">= 1.11" | ||
alias: hstateen0.ENVCFG | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].ENVCFG == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].ENVCFG = csr_value.ENVCFG; | ||
return csr_value.ENVCFG; | ||
description: | | ||
The ENVCFG bit in `hstateen0h` controls access to the `senvcfg` CSRs. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
CSRIND: | ||
long_name: siselect and sireg* access control | ||
location: 28 | ||
definedBy: Sscsrind | ||
alias: hstateen0.CSRIND | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CSRIND == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].CSRIND = csr_value.CSRIND; | ||
return csr_value.CSRIND; | ||
description: | | ||
The CSRIND bit in `hstateen0h` controls access to the `siselect` and the | ||
`sireg*`, (really `vsiselect` and `vsireg*`) CSRs provided by the Sscsrind | ||
extensions. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
AIA: | ||
long_name: Ssaia state access control | ||
location: 27 | ||
definedBy: Ssaia | ||
alias: hstateen0.AIA | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].AIA == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].AIA = csr_value.AIA; | ||
return csr_value.AIA; | ||
description: | | ||
The AIA bit in `hstateen0h` controls access to all state introduced by | ||
the Ssaia extension and is not controlled by either the CSRIND or the | ||
IMSIC bits of `hstateen0`. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
IMSIC: | ||
long_name: IMSIC state access control | ||
location: 26 | ||
definedBy: Ssaia | ||
alias: hstateen0.IMSIC | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].IMSIC == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].IMSIC = csr_value.IMSIC; | ||
return csr_value.IMSIC; | ||
description: | | ||
The IMSIC bit in `hstateen0h` controls access to the guest IMSIC state, | ||
including CSRs `stopei` (really `vstopei`), provided by the Ssaia extension. | ||
|
||
Setting the IMSIC bit in `hstateen0h` to zero prevents a virtual machine | ||
from accessing the hart’s IMSIC the same as setting `hstatus.`VGEIN = 0. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
CONTEXT: | ||
long_name: scontext access control | ||
location: 25 | ||
definedBy: Sdtrig | ||
alias: hstateen0.CONTEXT | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CONTEXT == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].CONTEXT = csr_value.CONTEXT; | ||
return csr_value.CONTEXT; | ||
description: | | ||
The CONTEXT bit in `hstateen0h` controls access to the `scontext` CSR provided | ||
by the Sdtrig extension. | ||
type: RW | ||
reset_value: UNDEFINED_LEGAL | ||
ThinkOpenly marked this conversation as resolved.
Show resolved
Hide resolved
|
||
CTR: | ||
long_name: ctr access control | ||
location: 22 | ||
alias: hstateen0.CTR | ||
sw_write(csr_value): | | ||
if (CSR[mstateen0].CTR == 1'b0){ | ||
return 0; | ||
} | ||
CSR[hstateen0].CTR = csr_value.CTR; | ||
return csr_value.CTR; | ||
description: | | ||
If the H extension is implemented and `mstateen0.CTR=1`, the `hstateen0.CTR` bit controls access to | ||
supervisor CTR state when V=1. This state includes `sctrctl` (really `vsctrctl`), `sctrstatus`, and `sireg*` | ||
(really `vsireg*`) when `siselect` (really `vsiselect`) is in 0x200..0x2FF. `hstateen0.CTR` is read-only 0 when | ||
`mstateen0.CTR=0`. | ||
type: RW | ||
reset_value: 0 | ||
sw_read(): return $bits(CSR[hstateen0])[63:32]; |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.