Hook up GPIO cycle counter for cosmo

Author: labbott

app/cosmo/base.toml

@@ -180,7 +180,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", "mmio_espi"]
+uses = ["mmio_sequencer", "mmio_info", "mmio_espi", "mmio_debug_ctrl"]
 notifications = ["timer", "vcore", "seq-irq"]
 
 [tasks.ignition_flash]

drv/cosmo-seq-server/build.rs

@@ -42,7 +42,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
 
     let out_file = out_dir.join("fmc_periph.rs");
     let mut file = std::fs::File::create(out_file)?;
-    for periph in ["sequencer", "info", "espi"] {
+    for periph in ["sequencer", "info", "espi", "debug_ctrl"] {
         write!(
             &mut file,
             "pub mod {periph} {{\n{}\n}}",

drv/cosmo-seq-server/src/main.rs

@@ -378,6 +378,7 @@ struct ServerImpl {
     hf: HostFlash,
     seq: fmc_sequencer::Sequencer,
     espi: fmc_periph::espi::Espi,
+    debug: fmc_periph::debug_ctrl::DebugCtrl,
     vcore: VCore,
     /// Static buffer for encoding ereports. This is a static so that we don't
     /// have it on the stack when encoding ereports.
@@ -395,6 +396,7 @@ impl ServerImpl {
 
         let seq = fmc_sequencer::Sequencer::new(loader.get_token());
         let espi = fmc_periph::espi::Espi::new(loader.get_token());
+        let debug = fmc_periph::debug_ctrl::DebugCtrl::new(loader.get_token());
 
         ringbuf_entry!(Trace::Startup {
             early_power_rdbks: (&seq.early_power_rdbks).into(),
@@ -422,6 +424,7 @@ impl ServerImpl {
             hf: HostFlash::from(HF.get_task_id()),
             seq,
             espi,
+            debug,
             vcore: VCore::new(I2C.get_task_id(), packrat),
             ereport_buf,
         }
@@ -919,18 +922,14 @@ impl idl::InOrderSequencerImpl for ServerImpl {
         &mut self,
         _: &RecvMessage,
     ) -> Result<u32, RequestError<core::convert::Infallible>> {
-        Err(RequestError::Fail(
-            idol_runtime::ClientError::BadMessageContents,
-        ))
+        Ok(self.debug.sp5_dbg2_toggle_counter.cnts())
     }
 
     fn gpio_cycle_count(
         &mut self,
         _: &RecvMessage,
     ) -> Result<u32, RequestError<core::convert::Infallible>> {
-        Err(RequestError::Fail(
-            idol_runtime::ClientError::BadMessageContents,
-        ))
+        Ok(self.debug.sp5_dbg2_toggle_timer.cnts())
     }
 }
 

task/control-plane-agent/src/inventory.rs

@@ -44,8 +44,8 @@ impl Inventory {
         match Index::try_from(component)? {
             Index::OurDevice(d) => {
                 match OUR_DEVICES[d].component {
-                    // The SP5 CPU can report a POST code
-                    SpComponent::SP5_HOST_CPU => Ok(1),
+                    // The SP5 CPU can report a POST code and GPIO cycle count
+                    SpComponent::SP5_HOST_CPU => Ok(2),
                     // The SP3 CPU can report GPIO toggle counts
                     SpComponent::SP3_HOST_CPU => Ok(1),
                     _ => Ok(0),

task/control-plane-agent/src/mgs_compute_sled.rs

@@ -920,13 +920,20 @@ impl SpHandler for MgsHandler {
             index,
             |dev, index| {
                 match dev.component {
-                    SpComponent::SP5_HOST_CPU => {
-                        // Only one component detail for now
-                        assert_eq!(index.0, 0);
-                        ComponentDetails::LastPostCode(LastPostCode(
+                    SpComponent::SP5_HOST_CPU => match index.0 {
+                        0 => ComponentDetails::LastPostCode(LastPostCode(
                             self.sequencer.last_post_code(),
-                        ))
-                    }
+                        )),
+                        1 => {
+                            ComponentDetails::GpioToggleCount(GpioToggleCount {
+                                edge_count: self.sequencer.gpio_edge_count(),
+                                cycles_since_last_edge: self
+                                    .sequencer
+                                    .gpio_cycle_count(),
+                            })
+                        }
+                        _ => panic!("invalid index"),
+                    },
                     SpComponent::SP3_HOST_CPU => {
                         // Only one component detail for now
                         assert_eq!(index.0, 0);