nvme: mi: Convert PortInformationResponse to FlagSet

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

Author: amboar

src/nvme/mi.rs

@@ -603,14 +603,14 @@ struct NvmSubsystemInformationResponse {
 impl Encode<32> for NvmSubsystemInformationResponse {}
 
 // MI v2.0, 5.7.2, Figure 114, PRTTYP
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, DekuRead, DekuWrite, PartialEq, Eq)]
+#[deku(ctx = "endian: Endian", endian = "endian", id_type = "u8")]
 #[repr(u8)]
 pub enum PortType {
     Inactive = 0x00,
     Pcie = 0x01,
     TwoWire = 0x02,
 }
-unsafe impl Discriminant<u8> for PortType {}
 
 impl From<&crate::PortType> for PortType {
     fn from(value: &crate::PortType) -> Self {
@@ -622,12 +622,20 @@ impl From<&crate::PortType> for PortType {
     }
 }
 
+// MI v2.0, 5.7.2, Figure 114, PRTCAP
+flags! {
+    enum PortCapabilityFlags: u8 {
+        Ciaps,
+        Aems,
+    }
+}
+
 // MI v2.0, 5.7.2, Figure 114
 #[derive(Debug, DekuWrite)]
 #[deku(endian = "little")]
 struct PortInformationResponse {
-    prttyp: u8,
-    prtcap: u8,
+    prttyp: PortType,
+    prtcap: WireFlagSet<PortCapabilityFlags>,
     mmtus: u16,
     mebs: u32,
 }

src/nvme/mi/dev.rs

@@ -8,6 +8,7 @@ use heapless::Vec;
 use log::debug;
 use mctp::{AsyncRespChannel, MsgIC};
 
+use crate::nvme::mi::PortCapabilityFlags;
 use crate::{
     CommandEffect, CommandEffectError, Controller, ControllerError, ControllerType, Discriminant,
     MAX_CONTROLLERS, MAX_NAMESPACES, NamespaceId, NamespaceIdDisposition, SubsystemError,
@@ -635,9 +636,21 @@ impl RequestHandler for NvmeMiDataStructureRequest {
                     return Err(ResponseStatus::InvalidParameter);
                 };
                 let pi = PortInformationResponse {
-                    // FIXME: Change prttyp to crate::nvme::mi::PortType
-                    prttyp: Into::<crate::nvme::mi::PortType>::into(&port.typ).id(),
-                    prtcap: (port.caps.aems as u8) << 1 | (port.caps.ciaps as u8),
+                    prttyp: Into::<crate::nvme::mi::PortType>::into(&port.typ),
+                    prtcap: {
+                        let mut flags = FlagSet::empty();
+
+                        if port.caps.ciaps {
+                            flags |= PortCapabilityFlags::Ciaps;
+                        }
+
+                        if port.caps.aems {
+                            flags |= PortCapabilityFlags::Aems;
+                        }
+
+                        flags
+                    }
+                    .into(),
                     mmtus: port.mmtus,
                     mebs: port.mebs,
                 }