Merge branch 'ved-rivos-1101'

src/smstateen.adoc

@@ -182,7 +182,8 @@ read-only).
 {bits: 1, name: 'C'},
 {bits: 1, name: 'FCSR'},
 {bits: 1, name: 'JVT'},
-{bits: 53, name: 'WPRI'},
+{bits: 52, name: 'WPRI'},
+{bits: 1, name: 'P1P14'},
 {bits: 1, name: 'P1P13'},
 {bits: 1, name: 'CONTEXT'},
 {bits: 1, name: 'IMSIC'},
@@ -288,8 +289,8 @@ extension.
 The P1P13 bit in `mstateen0` controls access to the `hedelegh` introduced by
 Privileged Specification Version 1.13.
 
-//The P1P14 bit in mstateen0 controls access to the srmcfg CSR introduced by
-//Privileged Specification Version 1.14.
+The P1P14 bit in `mstateen0` controls access to the `srmcfg` CSR introduced by
+the Ssqosid <<ssqosid>> extension.
 
 === Usage
 

src/supervisor.adoc

@@ -2271,8 +2271,7 @@ Invalid PTEs using a bounded timer, or making address-translation caches
 coherent with store instructions that modify PTEs.
 ====
 
-////
-[[sec:ssqosid]]
+[[ssqosid]]
 == "Ssqosid" Extension for Quality-of-Service (QoS) Identifiers, Version 1.0
 
 Quality of Service (QoS) is defined as the minimal end-to-end performance
@@ -2354,11 +2353,11 @@ modes of software execution on that hart by default, but this behavior may be
 overridden by future extensions.
 
 If extension Smstateen is implemented together with Ssqosid, then Ssqosid also
-requires the bit 55 in `mstateen0` introduced by Priv 1.14 to be implemented. If
-bit 55 of `mstateen0` is 0, attempts to access `srmcfg` in privilege modes less
-privileged than M-mode raise an illegal-instruction exception. If bit 55 of
-`mstateen0` is 1 or if extension Smstateen is not implemented, attempts to
-access `srmcfg` when `V=1` raise a virtual-instruction exception.
+requires the P1P14 bit in `mstateen0` to be implemented.
+If P1P14 of `mstateen0` is 0, attempts to access `srmcfg` in privilege modes
+less privileged than M-mode raise an illegal-instruction exception.
+If P1P14 bit of `mstateen0` is 1 or if extension Smstateen is not implemented,
+attempts to access `srmcfg` when `V=1` raise a virtual-instruction exception.
 
 [NOTE]
 ====
@@ -2394,4 +2393,3 @@ the new context, it switches to the new VM's `srmcfg`. The supervisor can also
 use a separate configuration for execution not to be attributed to either
 contexts.
 ====
-////