Add LastPostCode component details to SP5 host CPU

mkeeter · mkeeter · commit d2ca3fecac68 · 2025-09-25T15:44:02.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -145,7 +145,7 @@ zip = { version = "0.6", default-features = false, features = ["bzip2", "deflate
 # Oxide forks and repos
 attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.4.0" }
 dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"], branch = "mkeeter/last-post-code" }
 gateway-ereport-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false }
 gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }
 hif = { git = "https://github.com/oxidecomputer/hif", default-features = false }
diff --git a/app/cosmo/base.toml b/app/cosmo/base.toml
@@ -181,7 +181,7 @@ max-sizes = {flash = 131072, ram = 16384 }
 stacksize = 2600
 start = true
 task-slots = ["sys", "i2c_driver", {spi_front = "spi3_driver"}, "jefe", "packrat", "auxflash", "spartan7_loader", "hf"]
-uses = ["mmio_sequencer", "mmio_info"]
+uses = ["mmio_sequencer", "mmio_info", "mmio_espi"]
 notifications = ["timer", "vcore", "seq-irq"]
 
 [tasks.ignition_flash]
diff --git a/app/grapefruit/base.toml b/app/grapefruit/base.toml
@@ -181,7 +181,7 @@ max-sizes = {flash = 131072, ram = 16384 }
 stacksize = 2600
 start = true
 task-slots = ["sys", "jefe", "packrat", "spartan7_loader"]
-uses = ["mmio_sgpio"]
+uses = ["mmio_sgpio", "mmio_espi"]
 
 [tasks.spartan7_loader]
 name = "drv-spartan7-loader"
diff --git a/drv/cosmo-seq-server/build.rs b/drv/cosmo-seq-server/build.rs
@@ -40,12 +40,12 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         idol::server::ServerStyle::InOrder,
     )?;
 
-    let out_file = out_dir.join("fmc_sequencer.rs");
+    let out_file = out_dir.join("fmc_periph.rs");
     let mut file = std::fs::File::create(out_file)?;
-    for periph in ["sequencer", "info"] {
+    for periph in ["sequencer", "info", "espi"] {
         write!(
             &mut file,
-            "{}",
+            "pub mod {periph} {{\n{}\n}}",
             build_fpga_regmap::fpga_peripheral(
                 periph,
                 "drv_spartan7_loader_api::Spartan7Token"
diff --git a/drv/cosmo-seq-server/src/main.rs b/drv/cosmo-seq-server/src/main.rs
@@ -52,17 +52,17 @@ enum Trace {
     Programmed,
 
     Startup {
-        early_power_rdbks: fmc_periph::EarlyPowerRdbksView,
+        early_power_rdbks: fmc_sequencer::EarlyPowerRdbksView,
     },
     RegStateValues {
-        seq_api_status: fmc_periph::SeqApiStatusView,
-        seq_raw_status: fmc_periph::SeqRawStatusView,
-        nic_api_status: fmc_periph::NicApiStatusView,
-        nic_raw_status: fmc_periph::NicRawStatusView,
+        seq_api_status: fmc_sequencer::SeqApiStatusView,
+        seq_raw_status: fmc_sequencer::SeqRawStatusView,
+        nic_api_status: fmc_sequencer::NicApiStatusView,
+        nic_raw_status: fmc_sequencer::NicRawStatusView,
     },
     RegPgValues {
-        rail_pgs: fmc_periph::RailPgsView,
-        rail_pgs_max_hold: fmc_periph::RailPgsMaxHoldView,
+        rail_pgs: fmc_sequencer::RailPgsView,
+        rail_pgs_max_hold: fmc_sequencer::RailPgsMaxHoldView,
     },
     SetState {
         prev: Option<PowerState>,
@@ -73,12 +73,12 @@ enum Trace {
     },
     UnexpectedPowerOff {
         our_state: PowerState,
-        seq_state: Result<fmc_periph::A0Sm, u8>,
+        seq_state: Result<fmc_sequencer::A0Sm, u8>,
     },
     SequencerInterrupt {
         our_state: PowerState,
-        seq_state: Result<fmc_periph::A0Sm, u8>,
-        ifr: fmc_periph::IfrView,
+        seq_state: Result<fmc_sequencer::A0Sm, u8>,
+        ifr: fmc_sequencer::IfrView,
     },
     PowerDownError(drv_cpu_seq_api::SeqError),
     Coretype {
@@ -155,8 +155,8 @@ use gpio_irq_pins::SEQ_IRQ;
 
 /// Helper type which includes both sequencer and NIC state machine states
 struct StateMachineStates {
-    seq: Result<fmc_periph::A0Sm, u8>,
-    nic: Result<fmc_periph::NicSm, u8>,
+    seq: Result<fmc_sequencer::A0Sm, u8>,
+    nic: Result<fmc_sequencer::NicSm, u8>,
 }
 
 #[export_name = "main"]
@@ -260,7 +260,7 @@ fn init(packrat: Packrat) -> Result<ServerImpl, SeqError> {
 
     // Set up the checksum registers for the Spartan7 FPGA
     let token = loader.get_token();
-    let info = fmc_periph::Info::new(token);
+    let info = fmc_periph::info::Info::new(token);
     let short_checksum = gen::SPARTAN7_FPGA_BITSTREAM_CHECKSUM[..4]
         .try_into()
         .unwrap();
@@ -298,8 +298,7 @@ fn init(packrat: Packrat) -> Result<ServerImpl, SeqError> {
     // Turn on the chassis LED!
     sys.gpio_set(SP_CHASSIS_STATUS_LED);
 
-    let token = loader.get_token();
-    Ok(ServerImpl::new(token, packrat))
+    Ok(ServerImpl::new(loader, packrat))
 }
 
 /// Configures the front FPGA pins and holds it in reset
@@ -376,7 +375,8 @@ struct ServerImpl {
     jefe: Jefe,
     sys: Sys,
     hf: HostFlash,
-    seq: fmc_periph::Sequencer,
+    seq: fmc_sequencer::Sequencer,
+    espi: fmc_periph::espi::Espi,
     vcore: VCore,
     /// Static buffer for encoding ereports. This is a static so that we don't
     /// have it on the stack when encoding ereports.
@@ -387,11 +387,14 @@ const EREPORT_BUF_LEN: usize = 256;
 
 impl ServerImpl {
     fn new(
-        token: drv_spartan7_loader_api::Spartan7Token,
+        loader: drv_spartan7_loader_api::Spartan7Loader,
         packrat: Packrat,
     ) -> Self {
         let now = sys_get_timer().now;
-        let seq = fmc_periph::Sequencer::new(token);
+
+        let seq = fmc_sequencer::Sequencer::new(loader.get_token());
+        let espi = fmc_periph::espi::Espi::new(loader.get_token());
+
         ringbuf_entry!(Trace::Startup {
             early_power_rdbks: (&seq.early_power_rdbks).into(),
         });
@@ -417,6 +420,7 @@ impl ServerImpl {
             sys: Sys::from(SYS.get_task_id()),
             hf: HostFlash::from(HF.get_task_id()),
             seq,
+            espi,
             vcore: VCore::new(I2C.get_task_id(), packrat),
             ereport_buf,
         }
@@ -464,7 +468,7 @@ impl ServerImpl {
             now,
         });
 
-        use fmc_periph::A0Sm;
+        use fmc_sequencer::A0Sm;
         match (self.get_state_impl(), state) {
             (PowerState::A2, PowerState::A0) => {
                 // Reset edge counters in the sequencer
@@ -881,6 +885,13 @@ impl idl::InOrderSequencerImpl for ServerImpl {
             idol_runtime::ClientError::BadMessageContents,
         ))
     }
+
+    fn last_post_code(
+        &mut self,
+        _: &RecvMessage,
+    ) -> Result<u32, RequestError<core::convert::Infallible>> {
+        Ok(self.espi.last_post_code.payload())
+    }
 }
 
 impl NotificationHandler for ServerImpl {
@@ -897,7 +908,7 @@ impl NotificationHandler for ServerImpl {
             return;
         }
         let state = self.log_state_registers();
-        use fmc_periph::{A0Sm, NicSm};
+        use fmc_sequencer::{A0Sm, NicSm};
 
         // Detect when the NIC comes online
         // TODO: should we handle the NIC powering down while the main CPU
@@ -940,8 +951,9 @@ mod gen {
 }
 
 mod fmc_periph {
-    include!(concat!(env!("OUT_DIR"), "/fmc_sequencer.rs"));
+    include!(concat!(env!("OUT_DIR"), "/fmc_periph.rs"));
 }
+use fmc_periph::sequencer as fmc_sequencer;
 
 include!(concat!(env!("OUT_DIR"), "/notifications.rs"));
 include!(concat!(env!("OUT_DIR"), "/gpio_irq_pins.rs"));
diff --git a/drv/gimlet-seq-server/src/main.rs b/drv/gimlet-seq-server/src/main.rs
@@ -1135,6 +1135,15 @@ impl<S: SpiServer> idl::InOrderSequencerImpl for ServerImpl<S> {
 
         Ok(buf)
     }
+
+    fn last_post_code(
+        &mut self,
+        _: &RecvMessage,
+    ) -> Result<u32, RequestError<core::convert::Infallible>> {
+        Err(RequestError::Fail(
+            idol_runtime::ClientError::BadMessageContents,
+        ))
+    }
 }
 
 fn read_spd_data_and_load_packrat(
diff --git a/drv/grapefruit-seq-server/build.rs b/drv/grapefruit-seq-server/build.rs
@@ -12,16 +12,18 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     )?;
 
     let out_dir = build_util::out_dir();
-    let out_file = out_dir.join("fmc_sgpio.rs");
+    let out_file = out_dir.join("fmc_periph.rs");
     let mut file = std::fs::File::create(out_file)?;
-    write!(
-        &mut file,
-        "{}",
-        build_fpga_regmap::fpga_peripheral(
-            "sgpio",
-            "drv_spartan7_loader_api::Spartan7Token"
-        )?
-    )?;
+    for p in ["sgpio", "espi"] {
+        write!(
+            &mut file,
+            "pub mod {p} {{\n{}\n}}",
+            build_fpga_regmap::fpga_peripheral(
+                p,
+                "drv_spartan7_loader_api::Spartan7Token"
+            )?
+        )?;
+    }
 
     Ok(())
 }
diff --git a/drv/grapefruit-seq-server/src/main.rs b/drv/grapefruit-seq-server/src/main.rs
@@ -73,7 +73,8 @@ fn main() -> ! {
 #[allow(unused)]
 struct ServerImpl {
     jefe: Jefe,
-    sgpio: fmc_periph::Sgpio,
+    sgpio: fmc_periph::sgpio::Sgpio,
+    espi: fmc_periph::espi::Espi,
 }
 
 impl ServerImpl {
@@ -94,7 +95,8 @@ impl ServerImpl {
 
         let server = Self {
             jefe: Jefe::from(JEFE.get_task_id()),
-            sgpio: fmc_periph::Sgpio::new(loader.get_token()),
+            sgpio: fmc_periph::sgpio::Sgpio::new(loader.get_token()),
+            espi: fmc_periph::espi::Espi::new(loader.get_token()),
         };
 
         // Note that we don't use `Self::set_state_impl` here, as that will
@@ -182,6 +184,13 @@ impl idl::InOrderSequencerImpl for ServerImpl {
     ) -> Result<[u8; 64], RequestError<core::convert::Infallible>> {
         Ok([0; 64])
     }
+
+    fn last_post_code(
+        &mut self,
+        _: &RecvMessage,
+    ) -> Result<u32, RequestError<core::convert::Infallible>> {
+        Ok(self.espi.last_post_code.payload())
+    }
 }
 
 impl NotificationHandler for ServerImpl {
@@ -200,5 +209,5 @@ mod idl {
 }
 
 mod fmc_periph {
-    include!(concat!(env!("OUT_DIR"), "/fmc_sgpio.rs"));
+    include!(concat!(env!("OUT_DIR"), "/fmc_periph.rs"));
 }
diff --git a/drv/mock-gimlet-seq-server/src/main.rs b/drv/mock-gimlet-seq-server/src/main.rs
@@ -103,6 +103,15 @@ impl idl::InOrderSequencerImpl for ServerImpl {
     ) -> Result<[u8; 64], RequestError<core::convert::Infallible>> {
         Ok([0; 64])
     }
+
+    fn last_post_code(
+        &mut self,
+        _: &RecvMessage,
+    ) -> Result<u32, RequestError<core::convert::Infallible>> {
+        Err(RequestError::Fail(
+            idol_runtime::ClientError::BadMessageContents,
+        ))
+    }
 }
 
 impl NotificationHandler for ServerImpl {
diff --git a/idl/cpu-seq.idol b/idl/cpu-seq.idol
@@ -57,10 +57,16 @@ Interface(
             ),
         ),
         "read_fpga_regs": (
-            doc: "Raw read of the FPGA registers",
+            doc: "Raw read of the FPGA registers (Gimlet only)",
             args: {},
             reply: Simple("[u8; 64]"),
             idempotent: true,
         ),
+        "last_post_code": (
+            doc: "Read the last POST code seen by the sequencer FPGA (Cosmo only)",
+            args: {},
+            reply: Simple("u32"),
+            idempotent: true,
+        ),
     },
 )
diff --git a/task/control-plane-agent/src/inventory.rs b/task/control-plane-agent/src/inventory.rs
@@ -42,18 +42,28 @@ impl Inventory {
         component: &SpComponent,
     ) -> Result<u32, SpError> {
         match Index::try_from(component)? {
-            Index::OurDevice(_) => Ok(0),
+            Index::OurDevice(d) => {
+                match OUR_DEVICES[d].component {
+                    // The SP5 CPU can report a POST code
+                    SpComponent::SP5_HOST_CPU => Ok(1),
+                    _ => Ok(0),
+                }
+            }
             Index::ValidateDevice(i) => {
                 Ok(VALIDATE_DEVICES[i].sensors.len() as u32)
             }
         }
     }
 
-    pub(crate) fn component_details(
+    pub(crate) fn component_details<F>(
         &self,
         component: &SpComponent,
         component_index: BoundsChecked,
-    ) -> ComponentDetails {
+        our_device_lookup: F,
+    ) -> ComponentDetails
+    where
+        F: Fn(&DeviceDescription<'static>, BoundsChecked) -> ComponentDetails,
+    {
         // `component_index` is guaranteed to be in the range
         // `0..num_component_details(component)`, and we only return a value
         // greater than 0 from that method for indices in the VALIDATE_DEVICES
@@ -62,7 +72,10 @@ impl Inventory {
         // the `OurDevice(_)` subrange).
         let val_device_index = match Index::try_from(component) {
             Ok(Index::ValidateDevice(i)) => i,
-            Ok(Index::OurDevice(_)) | Err(_) => panic!(),
+            Ok(Index::OurDevice(i)) => {
+                return our_device_lookup(&OUR_DEVICES[i], component_index)
+            }
+            Err(_) => panic!(),
         };
 
         let sensor_description = &VALIDATE_DEVICES[val_device_index].sensors
diff --git a/task/control-plane-agent/src/mgs_compute_sled.rs b/task/control-plane-agent/src/mgs_compute_sled.rs
@@ -17,11 +17,12 @@ use gateway_messages::sp_impl::{
 use gateway_messages::{
     ignition, ComponentAction, ComponentActionResponse, ComponentDetails,
     ComponentUpdatePrepare, DiscoverResponse, DumpSegment, DumpTask, Header,
-    IgnitionCommand, IgnitionState, Message, MessageKind, MgsError, MgsRequest,
-    MgsResponse, PowerState, PowerStateTransition, RotBootInfo, RotRequest,
-    RotResponse, SensorRequest, SensorResponse, SpComponent, SpError,
-    SpPort as GwSpPort, SpRequest, SpStateV2, SpUpdatePrepare, UpdateChunk,
-    UpdateId, UpdateStatus, SERIAL_CONSOLE_IDLE_TIMEOUT,
+    IgnitionCommand, IgnitionState, LastPostCode, Message, MessageKind,
+    MgsError, MgsRequest, MgsResponse, PowerState, PowerStateTransition,
+    RotBootInfo, RotRequest, RotResponse, SensorRequest, SensorResponse,
+    SpComponent, SpError, SpPort as GwSpPort, SpRequest, SpStateV2,
+    SpUpdatePrepare, UpdateChunk, UpdateId, UpdateStatus,
+    SERIAL_CONSOLE_IDLE_TIMEOUT,
 };
 use heapless::{Deque, Vec};
 use host_sp_messages::HostStartupOptions;
@@ -914,7 +915,24 @@ impl SpHandler for MgsHandler {
         component: SpComponent,
         index: BoundsChecked,
     ) -> ComponentDetails {
-        self.common.inventory().component_details(&component, index)
+        self.common.inventory().component_details(
+            &component,
+            index,
+            |dev, index| {
+                match dev.component {
+                    SpComponent::SP5_HOST_CPU => {
+                        // Only one component detail for now
+                        assert_eq!(index.0, 0);
+                        ComponentDetails::LastPostCode(LastPostCode(
+                            self.sequencer.last_post_code(),
+                        ))
+                    }
+                    _ => {
+                        panic!("no other devices have component details");
+                    }
+                }
+            },
+        )
     }
 
     fn component_get_active_slot(
diff --git a/task/control-plane-agent/src/mgs_psc.rs b/task/control-plane-agent/src/mgs_psc.rs
diff --git a/task/control-plane-agent/src/mgs_sidecar.rs b/task/control-plane-agent/src/mgs_sidecar.rs

Original file line number	Diff line number	Diff line change
`@@ -1135,6 +1135,15 @@ impl<S: SpiServer> idl::InOrderSequencerImpl for ServerImpl<S> {`
`1135`	`1135`
`1136`	`1136`	`Ok(buf)`
`1137`	`1137`	`}`
	`1138`	`+`
	`1139`	`+ fn last_post_code(`
	`1140`	`+ &mut self,`
	`1141`	`+ _: &RecvMessage,`
	`1142`	`+ ) -> Result<u32, RequestError<core::convert::Infallible>> {`
	`1143`	`+ Err(RequestError::Fail(`
	`1144`	`+ idol_runtime::ClientError::BadMessageContents,`
	`1145`	`+ ))`
	`1146`	`+ }`
`1138`	`1147`	`}`
`1139`	`1148`
`1140`	`1149`	`fn read_spd_data_and_load_packrat(`