nvme: Convert AdminIdentifyControllerResponse to FlagSet

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

Author: amboar

src/nvme.rs

@@ -448,6 +448,42 @@ pub enum CommandSetIdentifier {
     ComputationalPrograms = 0x04,
 }
 
+// Base v2.1, 5.1.13.2.1, Figure 312, CMIC
+flags! {
+    enum ControllerMultipathIoNamespaceSharingCapabilityFlags: u8 {
+        Mports,
+        Mctrs,
+        Ft,
+        Anars,
+    }
+}
+
+// Base v2.1, 5.1.13.2.1, Figure 312, CTRATT
+flags! {
+    enum ControllerAttributeFlags: u32 {
+        Hids,
+        Nopspm,
+        Nsets,
+        Rrlvls,
+        Egs,
+        Plm,
+        Tbkas,
+        Ng,
+        Sqa,
+        Ulist,
+        Mds,
+        Fcm,
+        Vcm,
+        Deg,
+        Dnvms,
+        Elbas,
+        Mem,
+        Hmbr,
+        Rhii,
+        Fdps,
+    }
+}
+
 // Base v2.1, 5.1.13.2.1, Figure 312, CNTRLTYPE
 #[derive(Clone, Copy, Debug, DekuRead, DekuWrite, PartialEq)]
 #[deku(id_type = "u8", endian = "endian", ctx = "endian: Endian")]
@@ -469,6 +505,22 @@ impl From<crate::ControllerType> for ControllerType {
     }
 }
 
+// Base v2.1, 5.1.13.2.1, Figure 312, NVMSR
+flags! {
+    enum NvmSubsystemReportFlags: u8 {
+        Nvmesd,
+        Nvmee,
+    }
+}
+
+// Base v2.1, 5.1.13.2.1, Figure 312, MEC
+flags! {
+    enum ManagementEndpointCapabilityFlags: u8 {
+        Twpme,
+        Pcieme,
+    }
+}
+
 // Base v2.1, 5.1.13.2.1, Figure 312, LPA
 flags! {
     #[repr(u8)]
@@ -551,20 +603,20 @@ struct AdminIdentifyControllerResponse {
     fr: WireString<8>,
     rab: u8,
     ieee: [u8; 3],
-    cmic: u8,
+    cmic: WireFlagSet<ControllerMultipathIoNamespaceSharingCapabilityFlags>,
     mdts: u8,
     cntlid: u16,
     ver: u32,
     rtd3r: u32,
     rtd3e: u32,
     oaes: u32,
-    ctratt: u32,
+    ctratt: WireFlagSet<ControllerAttributeFlags>,
     #[deku(seek_from_current = "11")]
     cntrltype: crate::nvme::ControllerType,
     #[deku(seek_from_current = "141")]
-    nvmsr: u8,
+    nvmsr: WireFlagSet<NvmSubsystemReportFlags>,
     vwci: u8,
-    mec: u8,
+    mec: WireFlagSet<ManagementEndpointCapabilityFlags>,
     ocas: u16,
     acl: u8,
     aerl: u8,

src/nvme/mi/dev.rs

@@ -9,6 +9,10 @@ use log::debug;
 use mctp::{AsyncRespChannel, MsgIC};
 
 use crate::nvme::mi::{NvmSubsystemStatusFlags, PortCapabilityFlags};
+use crate::nvme::{
+    ControllerAttributeFlags, ControllerMultipathIoNamespaceSharingCapabilityFlags,
+    ManagementEndpointCapabilityFlags, NvmSubsystemReportFlags,
+};
 use crate::{
     CommandEffect, CommandEffectError, Controller, ControllerError, ControllerType, Discriminant,
     MAX_CONTROLLERS, MAX_NAMESPACES, NamespaceId, NamespaceIdDisposition, SubsystemError,
@@ -1385,26 +1389,66 @@ impl RequestHandler for AdminIdentifyRequest {
                             fixup.reverse();
                             fixup
                         },
-                        cmic: ((subsys.ctlrs.len() > 1) as u8) << 1 // MCTRS
-                        | ((subsys.ports.len() > 1) as u8), // MPORTS
+                        cmic: {
+                            let mut flags = FlagSet::empty();
+
+                            if subsys.ctlrs.len() > 1 {
+                                flags |=
+                                    ControllerMultipathIoNamespaceSharingCapabilityFlags::Mctrs;
+                            }
+
+                            if subsys.ports.len() > 1 {
+                                flags |=
+                                    ControllerMultipathIoNamespaceSharingCapabilityFlags::Mports;
+                            }
+
+                            flags
+                        }
+                        .into(),
                         mdts: 0,
                         cntlid: ctlr.id.0,
                         ver: 0,
                         rtd3r: 0,
                         rtd3e: 0,
                         oaes: 0,
                         // TODO: Tie to data model
-                        ctratt: ((false as u32) << 14) // DNVMS
-                        | ((false as u32) << 13) // DEG
-                        | ((false as u32) << 4) // EGS
-                        | ((false as u32) << 2), // NSETS
+                        ctratt: {
+                            let mut flags = FlagSet::empty();
+
+                            flags -= ControllerAttributeFlags::Nsets;
+                            flags -= ControllerAttributeFlags::Egs;
+                            flags -= ControllerAttributeFlags::Deg;
+                            flags -= ControllerAttributeFlags::Dnvms;
+
+                            flags
+                        }
+                        .into(),
                         cntrltype: ctlr.cntrltype.into(),
                         // TODO: Tie to data model
-                        nvmsr: ((false as u8) << 1) // NVMEE
-                        | (true as u8), // NVMESD
+                        nvmsr: { FlagSet::empty() | NvmSubsystemReportFlags::Nvmesd }.into(),
                         vwci: 0,
-                        mec: ((subsys.ports.iter().any(|p| matches!(p.typ, crate::PortType::Pcie(_)))) as u8) << 1 // PCIEME
-                        | (subsys.ports.iter().any(|p| matches!(p.typ, crate::PortType::TwoWire(_)))) as u8, // TWPME
+                        mec: {
+                            let mut flags = FlagSet::empty();
+
+                            if subsys
+                                .ports
+                                .iter()
+                                .any(|p| matches!(p.typ, crate::PortType::Pcie(_)))
+                            {
+                                flags |= ManagementEndpointCapabilityFlags::Pcieme;
+                            }
+
+                            if subsys
+                                .ports
+                                .iter()
+                                .any(|p| matches!(p.typ, crate::PortType::TwoWire(_)))
+                            {
+                                flags |= ManagementEndpointCapabilityFlags::Twpme;
+                            }
+
+                            flags
+                        }
+                        .into(),
                         ocas: 0,
                         acl: 0,
                         aerl: 0,