nvme: mi: Convert NvmSubsystemStatus to FlagSet

Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>

Author: amboar

src/lib.rs

@@ -439,13 +439,14 @@ impl Controller {
 
 #[derive(Debug)]
 struct SubsystemHealth {
-    nss: nvme::mi::NvmSubsystemStatus,
+    nss: FlagSet<crate::nvme::mi::NvmSubsystemStatusFlags>,
 }
 
 impl SubsystemHealth {
     fn new() -> Self {
         Self {
-            nss: nvme::mi::NvmSubsystemStatus::new(),
+            nss: crate::nvme::mi::NvmSubsystemStatusFlags::Rnr
+                | crate::nvme::mi::NvmSubsystemStatusFlags::Df,
         }
     }
 }

src/nvme/mi.rs

@@ -496,39 +496,22 @@ struct CompositeControllerStatusDataStructureResponse {
 impl Encode<4> for CompositeControllerStatusDataStructureResponse {}
 
 // MI v2.0, 5.6, Figure 108, NSS
-// TODO: Convert to Flags/FlagSet
-#[derive(Debug)]
-pub struct NvmSubsystemStatus {
-    atf: bool,
-    sfm: bool,
-    df: bool,
-    rnr: bool,
-    rd: bool,
-}
-
-impl Default for NvmSubsystemStatus {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl NvmSubsystemStatus {
-    pub fn new() -> Self {
-        Self {
-            atf: false,
-            sfm: false,
-            df: true,
-            rnr: true,
-            rd: false,
-        }
+flags! {
+    pub enum NvmSubsystemStatusFlags: u8 {
+        P1la = 1 << 2,
+        P0la = 1 << 3,
+        Rnr = 1 << 4,
+        Df = 1 << 5,
+        Sfm = 1 << 6,
+        Atf = 1 << 7,
     }
 }
 
 // MI v2.0, 5.6, Figure 108
 #[derive(Debug, DekuRead, DekuWrite)]
 #[deku(endian = "little")]
 struct NvmSubsystemHealthDataStructureResponse {
-    nss: u8,
+    nss: WireFlagSet<NvmSubsystemStatusFlags>,
     sw: u8,
     ctemp: u8,
     pldu: u8,

src/nvme/mi/dev.rs

@@ -8,7 +8,7 @@ use heapless::Vec;
 use log::debug;
 use mctp::{AsyncRespChannel, MsgIC};
 
-use crate::nvme::mi::PortCapabilityFlags;
+use crate::nvme::mi::{NvmSubsystemStatusFlags, PortCapabilityFlags};
 use crate::{
     CommandEffect, CommandEffectError, Controller, ControllerError, ControllerType, Discriminant,
     MAX_CONTROLLERS, MAX_NAMESPACES, NamespaceId, NamespaceIdDisposition, SubsystemError,
@@ -224,17 +224,21 @@ impl RequestHandler for NvmeMiCommandRequestHeader {
                 let pdlu = core::cmp::min(255, 100 * ctlr.write_age / ctlr.write_lifespan);
 
                 let nvmshds = NvmSubsystemHealthDataStructureResponse {
-                    nss: (subsys.health.nss.atf as u8) << 7
-                        | (subsys.health.nss.sfm as u8) << 6
-                        | (subsys.health.nss.df as u8) << 5
-                        | (subsys.health.nss.rnr as u8) << 4
-                        | ((pprt.cls != crate::pcie::LinkSpeed::Inactive) as u8) << 3 // P0LA
-                        | (false as u8) << 2, // P1LA
+                    nss: {
+                        let mut flags = subsys.health.nss;
+
+                        if pprt.cls != crate::pcie::LinkSpeed::Inactive {
+                            flags |= NvmSubsystemStatusFlags::P0la;
+                        }
+
+                        flags
+                    }
+                    .into(),
                     #[allow(clippy::nonminimal_bool)]
                     sw: (!false as u8) << 5 // PMRRO
                         | (!false as u8) << 4 // VMBF
                         | (!ctlr.ro as u8) << 3 // AMRO
-                        | (!subsys.health.nss.rd as u8) << 2 // NDR
+                        | (!ctlr.ro as u8) << 2 // NDR
                         | (!(ctlr.temp_range.lower <= ctlr.temp && ctlr.temp <= ctlr.temp_range.upper) as u8) << 1 // TTC
                         | (!((100 * ctlr.spare / ctlr.capacity) < ctlr.spare_range.lower) as u8),
                     ctemp: ctemp as u8,