Add LastPostCode component details to SP5 host CPU

Author: mkeeter

Cargo.lock

@@ -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]

app/cosmo/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"

app/grapefruit/base.toml

@@ -449,6 +449,7 @@ pub fn build_peripheral(
             else {
                 panic!("nodes within register must be fields, not {c:?}");
             };
+            let desc = Some(desc.as_str()).filter(|s| !s.is_empty());
             let msb = u32::try_from(*msb).unwrap();
             let lsb = u32::try_from(*lsb).unwrap();
             let setter: syn::Ident =
@@ -458,9 +459,10 @@ pub fn build_peripheral(
                 syn::parse_str(&inst_name.to_snake_case()).unwrap();
             if lsb == msb {
                 if sw_access.is_write() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #setter(&self, t: bool) {
                             let mut d = self.get_raw();
                             if t {
@@ -473,9 +475,10 @@ pub fn build_peripheral(
                     });
                 }
                 if sw_access.is_read() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #getter(&self) -> bool {
                             let d = self.get_raw();
                             (d & (1 << #msb)) != 0
@@ -535,9 +538,10 @@ pub fn build_peripheral(
                     }
                 });
                 if sw_access.is_write() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #setter(&self, t: #ty) {
                             let mut d = self.get_raw();
                             d &= !(#mask << #lsb);
@@ -547,9 +551,10 @@ pub fn build_peripheral(
                     });
                 }
                 if sw_access.is_read() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #getter(&self) -> Result<#ty, #raw_ty> {
                             let d = self.get_raw();
                             let t = ((d >> #lsb) & #mask) as #raw_ty;
@@ -576,9 +581,10 @@ pub fn build_peripheral(
                 };
                 let ty: syn::Ident = syn::parse_str(ty).unwrap();
                 if sw_access.is_write() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #setter(&self, t: #ty) {
                             let mut d = self.get_raw();
                             d &= !(#mask << #lsb);
@@ -588,9 +594,10 @@ pub fn build_peripheral(
                     });
                 }
                 if sw_access.is_read() {
+                    let doc = desc.into_iter();
                     struct_fns.push(quote! {
                         #[inline]
-                        #[doc = #desc]
+                        #(#[doc = #doc])*
                         pub fn #getter(&self) -> #ty {
                             let d = self.get_raw();
                             ((d >> #lsb) & #mask) as #ty

build/fpga-regmap/src/lib.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"

drv/cosmo-seq-server/build.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"));

drv/cosmo-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(

drv/gimlet-seq-server/src/main.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(())
 }

drv/grapefruit-seq-server/build.rs

@@ -75,7 +75,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 {
@@ -96,7 +97,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
@@ -184,6 +186,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 {
@@ -202,5 +211,5 @@ mod idl {
 }
 
 mod fmc_periph {
-    include!(concat!(env!("OUT_DIR"), "/fmc_sgpio.rs"));
+    include!(concat!(env!("OUT_DIR"), "/fmc_periph.rs"));
 }

drv/grapefruit-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 {