Merge branch 'main' into tech-port-unlock

Author: plotnick

Cargo.lock

@@ -26,8 +26,8 @@ anyhow = "1.0"
 async-trait = "0.1"
 backoff = { version = "0.4.0", features = ["tokio"] }
 base64 = "0.22.1"
-bitflags = "2.9.3"
-camino = "1.1.12"
+bitflags = "2.9.4"
+camino = "1.2.0"
 camino-tempfile = "1.4.1"
 clap = { version = "4.5", features = ["derive", "env"] }
 convert_case = "0.8"
@@ -37,7 +37,7 @@ fxhash = "0.2.1"
 glob = "0.3.3"
 hex = "0.4.3"
 hubpack = "0.1.2"
-humantime = "2.2.0"
+humantime = "2.3.0"
 indicatif = "0.18"
 lru-cache = "0.1.2"
 lzss = "0.8"
@@ -49,9 +49,9 @@ parse_int = "0.6"
 rand = "0.9.2"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde-big-array = "0.5.1"
-serde_bytes = "0.11.17"
+serde_bytes = "0.11.19"
 serde_cbor = "0.11.2"
-serde_json = "1.0.143"
+serde_json = "1.0.145"
 serde_repr = { version = "0.1" }
 sha2 = "0.10"
 slog = { version = "2.7", features = ["max_level_trace", "release_max_level_trace"] }
@@ -66,14 +66,14 @@ strum = { version = "0.27.2", default-features = false }
 strum_macros = "0.27.2"
 string_cache = "0.8.9"
 termios = "0.3"
-thiserror = "2.0.16"
+thiserror = "2.0.17"
 tokio = { version = "1.29", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["fs"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 usdt = "0.5.0"
-uuid = { version = "1.16", default-features = false }
+uuid = { version = "1.18", default-features = false }
 version_check = "0.9.5"
-zerocopy = "0.8.26"
+zerocopy = "0.8.27"
 zip = { version = "0.6.6", default-features = false, features = ["deflate", "bzip2"] }
 
 gateway-messages.path = "gateway-messages"

Cargo.toml

@@ -1356,9 +1356,31 @@ async fn run_command(
             if json {
                 return Ok(Output::Json(component_details_to_json(details)));
             }
+
+            /// Helper `struct` to pretty-print component details
+            ///
+            /// This normally delegates to `Debug`, but prints `LastPostCode` as
+            /// a hex value for convenience.
+            struct ComponentDetailPrinter(gateway_messages::ComponentDetails);
+            impl std::fmt::Display for ComponentDetailPrinter {
+                fn fmt(
+                    &self,
+                    f: &mut std::fmt::Formatter<'_>,
+                ) -> std::fmt::Result {
+                    use gateway_messages::ComponentDetails;
+                    match &self.0 {
+                        ComponentDetails::LastPostCode(p) => {
+                            write!(f, "LastPostCode({:#x})", p.0)
+                        }
+                        d => write!(f, "{d:?}"),
+                    }
+                }
+            }
+
             let mut lines = Vec::new();
             for entry in details.entries {
-                lines.push(format!("{entry:?}"));
+                let d = ComponentDetailPrinter(entry);
+                lines.push(format!("{d}"));
             }
             Ok(Output::Lines(lines))
         }
@@ -2310,6 +2332,7 @@ fn component_details_to_json(details: SpComponentDetails) -> serde_json::Value {
     enum ComponentDetails {
         PortStatus(Result<PortStatus, PortStatusError>),
         Measurement(Measurement),
+        LastPostCode(u32),
     }
 
     #[derive(serde::Serialize)]
@@ -2333,6 +2356,9 @@ fn component_details_to_json(details: SpComponentDetails) -> serde_json::Value {
                     value: m.value,
                 })
             }
+            gateway_messages::ComponentDetails::LastPostCode(code) => {
+                ComponentDetails::LastPostCode(code.0)
+            }
         })
         .collect::<Vec<_>>();
 

faux-mgs/src/main.rs

@@ -69,7 +69,7 @@ pub const HF_PAGE_SIZE: usize = 256;
 /// for more detail and discussion.
 pub mod version {
     pub const MIN: u32 = 2;
-    pub const CURRENT: u32 = 20;
+    pub const CURRENT: u32 = 21;
 
     /// MGS protocol version in which SP watchdog messages were added
     pub const WATCHDOG_VERSION: u32 = 12;

gateway-messages/src/lib.rs

@@ -25,9 +25,11 @@ use serde_repr::Serialize_repr;
 pub mod ignition;
 pub mod measurement;
 pub mod monorail_port_status;
+pub mod sp5_details;
 
 pub use ignition::IgnitionState;
 pub use measurement::Measurement;
+pub use sp5_details::LastPostCode;
 
 use ignition::IgnitionError;
 use measurement::MeasurementHeader;
@@ -710,17 +712,21 @@ pub struct TlvPage {
 /// serialization traits; it only serves as an organizing collection of the
 /// possible types contained in a component details message. Each TLV-encoded
 /// struct corresponds to one of these cases.
+///
+/// As such, it is not part of the explicit message versioning scheme
 #[derive(Debug, Clone)]
 pub enum ComponentDetails {
     PortStatus(Result<PortStatus, PortStatusError>),
     Measurement(Measurement),
+    LastPostCode(LastPostCode),
 }
 
 impl ComponentDetails {
     pub fn tag(&self) -> tlv::Tag {
         match self {
             ComponentDetails::PortStatus(_) => PortStatus::TAG,
             ComponentDetails::Measurement(_) => MeasurementHeader::TAG,
+            ComponentDetails::LastPostCode(_) => LastPostCode::TAG,
         }
     }
 
@@ -742,6 +748,9 @@ impl ComponentDetails {
                     Ok(n + m.name.len())
                 }
             }
+            ComponentDetails::LastPostCode(code) => {
+                hubpack::serialize(buf, code)
+            }
         }
     }
 }

gateway-messages/src/sp_to_mgs.rs

@@ -113,6 +113,7 @@ pub enum SystemType {
     Sidecar,
     Psc,
     Unknown(u16),
+    Cosmo,
 }
 
 impl From<u16> for SystemType {
@@ -121,6 +122,7 @@ impl From<u16> for SystemType {
             raw_system_type::GIMLET => Self::Gimlet,
             raw_system_type::SIDECAR => Self::Sidecar,
             raw_system_type::PSC => Self::Psc,
+            raw_system_type::COSMO => Self::Cosmo,
             _ => Self::Unknown(val),
         }
     }
@@ -131,6 +133,7 @@ mod raw_system_type {
     pub(super) const GIMLET: u16 = 0b0000_0000_0001_0001;
     pub(super) const SIDECAR: u16 = 0b0000_0000_0001_0010;
     pub(super) const PSC: u16 = 0b0000_0000_0001_0011;
+    pub(super) const COSMO: u16 = 0b0000_0000_0000_0100;
 }
 
 #[derive(

gateway-messages/src/sp_to_mgs/ignition.rs

@@ -0,0 +1,15 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+use crate::tlv;
+use hubpack::SerializedSize;
+use serde::{Deserialize, Serialize};
+
+/// Most recent POST code seen by the sequencer FPGA
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, SerializedSize)]
+pub struct LastPostCode(pub u32);
+
+impl LastPostCode {
+    pub const TAG: tlv::Tag = tlv::Tag(*b"POST");
+}

gateway-messages/src/sp_to_mgs/sp5_details.rs

@@ -26,6 +26,7 @@ mod v17;
 mod v18;
 mod v19;
 mod v20;
+mod v21;
 
 pub fn assert_serialized<T: Serialize + SerializedSize + std::fmt::Debug>(
     expected: &[u8],

gateway-messages/tests/versioning/mod.rs

@@ -0,0 +1,34 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! This source file is named after the protocol version being tested,
+//! e.g. v01.rs implements tests for protocol version 1.
+//! The tested protocol version is represented by "$VERSION" below.
+//!
+//! The tests in this module check that the serialized form of messages from MGS
+//! protocol version $VERSION have not changed.
+//!
+//! If a test in this module fails, _do not change the test_! This means you
+//! have changed, deleted, or reordered an existing message type or enum
+//! variant, and you should revert that change. This will remain true until we
+//! bump the `version::MIN` to a value higher than $VERSION, at which point these
+//! tests can be removed as we will stop supporting $VERSION.
+
+use super::assert_serialized;
+use gateway_messages::ignition::SystemType;
+
+#[test]
+fn cosmo_ignition() {
+    // We technically only need `Cosmo` but test everything else
+    // here again for good measure
+    for (system_type, system_type_val) in [
+        (SystemType::Gimlet, &[0_u8] as &[_]),
+        (SystemType::Sidecar, &[1]),
+        (SystemType::Psc, &[2]),
+        (SystemType::Unknown(0xa0a1), &[3, 0xa1, 0xa0]),
+        (SystemType::Cosmo, &[4]),
+    ] {
+        assert_serialized(&system_type_val, &system_type);
+    }
+}

gateway-messages/tests/versioning/v21.rs

@@ -1576,6 +1576,7 @@ impl TlvRpc for ComponentDetailsTlvRpc<'_> {
         use gateway_messages::measurement::MeasurementHeader;
         use gateway_messages::monorail_port_status::PortStatus;
         use gateway_messages::monorail_port_status::PortStatusError;
+        use gateway_messages::sp5_details::LastPostCode;
 
         match tag {
             PortStatus::TAG => {
@@ -1622,6 +1623,23 @@ impl TlvRpc for ComponentDetailsTlvRpc<'_> {
                     value: header.value,
                 })))
             }
+            LastPostCode::TAG => {
+                let (result, leftover) =
+                    gateway_messages::deserialize::<LastPostCode>(value)
+                        .map_err(|err| CommunicationError::TlvDeserialize {
+                            tag,
+                            err,
+                        })?;
+
+                if !leftover.is_empty() {
+                    info!(
+                        self.log,
+                        "ignoring unexpected data in LastPostCode TLV entry"
+                    );
+                }
+
+                Ok(Some(ComponentDetails::LastPostCode(result)))
+            }
             _ => {
                 info!(
                     self.log,