oxidecomputer · hawkw · Mar 11, 2026 · Feb 26, 2026 · Feb 25, 2026 · Feb 25, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/drv/cosmo-seq-server/Cargo.toml b/drv/cosmo-seq-server/Cargo.toml
@@ -16,7 +16,7 @@ drv-packrat-vpd-loader = { path = "../packrat-vpd-loader" }
 drv-spartan7-loader-api = { path = "../spartan7-loader-api" }
 drv-spi-api = { path = "../spi-api" }
 drv-stm32xx-sys-api = { path = "../stm32xx-sys-api" }
-ereports = { path = "../../lib/ereports" }
+ereports = { path = "../../lib/ereports", features = ["ereporter-macro"] }
 gnarle = { path = "../../lib/gnarle" }
 ringbuf = { path = "../../lib/ringbuf" }
 userlib = { path = "../../sys/userlib", features = ["panic-messages"] }

diff --git a/drv/cosmo-seq-server/src/main.rs b/drv/cosmo-seq-server/src/main.rs
@@ -118,9 +118,6 @@ enum Trace {
     },
     UnexpectedInterrupt,
     CPUNotPresent,
-    EreportSent(usize),
-    EreportLost(usize, task_packrat_api::EreportWriteError),
-    EreportTooBig,
 }
 counted_ringbuf!(Trace, 128, Trace::None);
 
@@ -183,17 +180,7 @@ fn main() -> ! {
     let packrat = Packrat::from(PACKRAT.get_task_id());
     read_vpd_and_load_packrat(&packrat, I2C.get_task_id());
 
-    let ereport_buf = {
-        use static_cell::ClaimOnceCell;
-        static EREPORT_BUF: ClaimOnceCell<[u8; EREPORT_BUF_LEN]> =
-            ClaimOnceCell::new([0; EREPORT_BUF_LEN]);
-        EREPORT_BUF.claim()
-    };
-
-    let mut ereporter = Ereporter {
-        packrat,
-        buf: ereport_buf,
-    };
+    let mut ereporter = Ereporter::claim_static_resources(packrat);
 
     //
     // Apply the configuration mitigation on the BMR491, if required. This
@@ -227,7 +214,7 @@ fn main() -> ! {
                 last_cause,
                 succeeded,
             };
-            ereporter.try_send_ereport(&ereport);
+            ereporter.deliver_ereport(&ereport);
         }
     }
 
@@ -568,7 +555,7 @@ impl ServerImpl {
 
                                 if !present {
                                     ringbuf_entry!(Trace::CPUNotPresent);
-                                    self.ereporter.try_send_ereport(
+                                    self.ereporter.deliver_ereport(
                                         &ereports::cpu::CpuMissing {
                                             cpu: &HOST_CPU_REFDES,
                                         },
@@ -637,7 +624,7 @@ impl ServerImpl {
                             ok: sp5rx_ok,
                         },
                     };
-                    self.ereporter.try_send_ereport(&ereport);
+                    self.ereporter.deliver_ereport(&ereport);
                     return Err(CpuSeqError::UnrecognizedCPU);
                 }
 
@@ -936,7 +923,7 @@ impl ServerImpl {
             self.seq.ifr.modify(|h| h.set_thermtrip(true));
             ringbuf_entry!(Trace::Thermtrip);
             action = InternalAction::ThermTrip;
-            self.ereporter.try_send_ereport(&ereports::cpu::Thermtrip {
+            self.ereporter.deliver_ereport(&ereports::cpu::Thermtrip {
                 cpu: &HOST_CPU_REFDES,
                 state: self.ereport_current_state(),
             });
@@ -954,7 +941,7 @@ impl ServerImpl {
             self.seq.ifr.modify(|h| h.set_smerr_assert(true));
             ringbuf_entry!(Trace::SmerrInterrupt);
             action = InternalAction::Smerr;
-            self.ereporter.try_send_ereport(&ereports::cpu::Smerr {
+            self.ereporter.deliver_ereport(&ereports::cpu::Smerr {
                 cpu: &HOST_CPU_REFDES,
                 state: self.ereport_current_state(),
             });
@@ -1236,49 +1223,25 @@ impl NotificationHandler for ServerImpl {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-const EREPORT_BUF_LEN: usize = microcbor::max_cbor_len_for![
-    ereports::pwr::PmbusAlert<vcore::Rail, { REFDES_LEN }>,
-    ereports::pwr::Bmr491MitigationFailure<{ REFDES_LEN }>,
-    ereports::cpu::Thermtrip,
-    ereports::cpu::Smerr,
-    ereports::cpu::UnsupportedCpu<3, 4>,
-    ereports::cpu::CpuMissing,
-];
+ereports::declare_ereporter! {
+    pub(crate) struct Ereporter<SeqEreport> {
+        PmbusAlert(ereports::pwr::PmbusAlert<vcore::Rail, { REFDES_LEN }>),
+        Bmr491MitigationFailure(
+            ereports::pwr::Bmr491MitigationFailure<{ REFDES_LEN }>
+        ),
+        Thermtrip(ereports::cpu::Thermtrip),
+        Smerr(ereports::cpu::Smerr),
+        UnsupportedCpu(ereports::cpu::UnsupportedCpu<3, 4>),
+        CpuMissing(ereports::cpu::CpuMissing),
+    }
+}
 
 static HOST_CPU_REFDES: ereports::cpu::HostCpuRefdes =
     ereports::cpu::HostCpuRefdes {
         refdes: fixedstr::FixedString::from_str("P0"),
         dev_id: fixedstr::FixedString::from_str("sp5-host-cpu"),
     };
 
-/// This is just the Packrat API handle and the ereport buffer bundled together
-/// in one thing so that it can be passed into various places as a single
-/// argument.
-pub(crate) struct Ereporter {
-    packrat: task_packrat_api::Packrat,
-    buf: &'static mut [u8; EREPORT_BUF_LEN],
-}
-
-impl Ereporter {
-    pub(crate) fn try_send_ereport(
-        &mut self,
-        ereport: &impl microcbor::StaticCborLen,
-    ) {
-        let eresult = self
-            .packrat
-            .deliver_microcbor_ereport(&ereport, &mut self.buf[..]);
-        match eresult {
-            Ok(len) => ringbuf_entry!(Trace::EreportSent(len)),
-            Err(task_packrat_api::EreportEncodeError::Packrat { len, err }) => {
-                ringbuf_entry!(Trace::EreportLost(len, err))
-            }
-            Err(task_packrat_api::EreportEncodeError::Encoder(_)) => {
-                ringbuf_entry!(Trace::EreportTooBig)
-            }
-        }
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 mod idl {

diff --git a/drv/cosmo-seq-server/src/vcore.rs b/drv/cosmo-seq-server/src/vcore.rs
@@ -477,7 +477,7 @@ impl VCore {
             pmbus_status,
             pwr_good: power_good,
         };
-        ereporter.try_send_ereport(&ereport);
+        ereporter.deliver_ereport(&ereport);
         // TODO(eliza): if POWER_GOOD has been deasserted, we should produce a
         // subsequent ereport for that.
 

diff --git a/drv/gimlet-seq-server/Cargo.toml b/drv/gimlet-seq-server/Cargo.toml
@@ -15,7 +15,7 @@ drv-spi-api = { path = "../spi-api" }
 drv-stm32h7-spi = { path = "../stm32h7-spi" }
 drv-stm32xx-sys-api = { path = "../stm32xx-sys-api" }
 counters = { path = "../../lib/counters" }
-ereports = { path = "../../lib/ereports" }
+ereports = { path = "../../lib/ereports", features = ["ereporter-macro"] }
 gnarle = { path = "../../lib/gnarle" }
 ringbuf = { path = "../../lib/ringbuf" }
 task-jefe-api = { path = "../../task/jefe-api" }

diff --git a/drv/gimlet-seq-server/src/main.rs b/drv/gimlet-seq-server/src/main.rs
@@ -31,7 +31,6 @@ use idol_runtime::{NotificationHandler, RequestError};
 use seq_spi::{Addr, Reg};
 use static_assertions::const_assert;
 use task_jefe_api::Jefe;
-use task_packrat_api as packrat_api;
 
 task_slot!(SYS, sys);
 task_slot!(SPI, spi_driver);
@@ -158,9 +157,6 @@ enum Trace {
         retries_remaining: u8,
     },
     StartFailed(#[count(children)] SeqError),
-    EreportSent(usize),
-    EreportLost(usize, packrat_api::EreportWriteError),
-    EreportTooBig,
 }
 
 counted_ringbuf!(Trace, 128, Trace::None);
@@ -452,15 +448,7 @@ impl<S: SpiServer + Clone> ServerImpl<S> {
         }
 
         let packrat = Packrat::from(PACKRAT.get_task_id());
-        let mut ereporter = {
-            use static_cell::ClaimOnceCell;
-            static EREPORT_BUF: ClaimOnceCell<[u8; EREPORT_BUF_LEN]> =
-                ClaimOnceCell::new([0; EREPORT_BUF_LEN]);
-            Ereporter {
-                buf: EREPORT_BUF.claim(),
-                packrat: packrat.clone(),
-            }
-        };
+        let mut ereporter = Ereporter::claim_static_resources(packrat.clone());
 
         //
         // Apply the configuration mitigation on the BMR491, if required. This
@@ -495,7 +483,7 @@ impl<S: SpiServer + Clone> ServerImpl<S> {
                     last_cause,
                     succeeded,
                 };
-                ereporter.try_send_ereport(&ereport);
+                ereporter.deliver_ereport(&ereport);
             }
         }
 
@@ -859,7 +847,7 @@ impl<S: SpiServer> ServerImpl<S> {
                 ringbuf_entry!(Trace::CPUPresent(present));
 
                 if !present {
-                    self.ereporter.try_send_ereport(
+                    self.ereporter.deliver_ereport(
                         &ereports::cpu::CpuMissing {
                             cpu: &HOST_CPU_REFDES,
                         },
@@ -885,7 +873,7 @@ impl<S: SpiServer> ServerImpl<S> {
                 //
                 let rev_ok = sp3r1 && !sp3r2;
                 if !coretype || !rev_ok {
-                    self.ereporter.try_send_ereport(
+                    self.ereporter.deliver_ereport(
                         &ereports::cpu::UnsupportedCpu {
                             cpu: &HOST_CPU_REFDES,
                             coretype: ereports::cpu::CpuTypeBits {
@@ -1108,7 +1096,7 @@ impl<S: SpiServer> ServerImpl<S> {
 
         if ifr & thermtrip != 0 {
             self.seq.clear_bytes(Addr::IFR, &[thermtrip]).unwrap_lite();
-            self.ereporter.try_send_ereport(&ereports::cpu::Thermtrip {
+            self.ereporter.deliver_ereport(&ereports::cpu::Thermtrip {
                 cpu: &HOST_CPU_REFDES,
                 state: self.ereport_current_state(),
             });
@@ -1627,46 +1615,33 @@ cfg_if::cfg_if! {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-const EREPORT_BUF_LEN: usize = microcbor::max_cbor_len_for![
-    ereports::pwr::PmbusAlert<FixedStr<'static, 9>, { REFDES_LEN }>,
-    ereports::pwr::Bmr491MitigationFailure<{ REFDES_LEN }>,
-    ereports::cpu::Thermtrip,
-    ereports::cpu::UnsupportedCpu<1, 2>,
-    ereports::cpu::CpuMissing,
-];
+ereports::declare_ereporter! {
+    pub(crate) struct Ereporter<SeqEreport> {
+        PmbusAlert(
+            ereports::pwr::PmbusAlert<
+                FixedStr<'static, 9>,
+                { REFDES_LEN },
+            >,
+        ),
+        Bmr491MitigationFailure(
+            ereports::pwr::Bmr491MitigationFailure<{ REFDES_LEN }>
+        ),
+        Thermtrip(ereports::cpu::Thermtrip),
+        UnsupportedCpu(ereports::cpu::UnsupportedCpu<1, 2>),
+        CpuMissing(ereports::cpu::CpuMissing),
+    }
+}
 
 static HOST_CPU_REFDES: ereports::cpu::HostCpuRefdes =
     ereports::cpu::HostCpuRefdes {
         refdes: fixedstr::FixedString::from_str("P0"),
         dev_id: fixedstr::FixedString::from_str("sp3-host-cpu"),
     };
 
-/// This is just the Packrat API handle and the ereport buffer bundled together
-/// in one thing so that it can be passed into various places as a single
-/// argument.
-pub(crate) struct Ereporter {
-    packrat: task_packrat_api::Packrat,
-    buf: &'static mut [u8; EREPORT_BUF_LEN],
-}
-
-impl Ereporter {
-    pub(crate) fn try_send_ereport(
-        &mut self,
-        ereport: &impl microcbor::StaticCborLen,
-    ) {
-        let eresult = self
-            .packrat
-            .deliver_microcbor_ereport(&ereport, &mut self.buf[..]);
-        match eresult {
-            Ok(len) => ringbuf_entry!(Trace::EreportSent(len)),
-            Err(task_packrat_api::EreportEncodeError::Packrat { len, err }) => {
-                ringbuf_entry!(Trace::EreportLost(len, err))
-            }
-            Err(task_packrat_api::EreportEncodeError::Encoder(_)) => {
-                ringbuf_entry!(Trace::EreportTooBig)
-            }
-        }
-    }
+#[derive(Clone, microcbor::EncodeFields)]
+struct CpuTypeBits {
+    coretype: bool,
+    sp3rx: [bool; 2],
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/drv/gimlet-seq-server/src/vcore.rs b/drv/gimlet-seq-server/src/vcore.rs
@@ -338,7 +338,7 @@ impl VCore {
             pwr_good,
             pmbus_status: status,
         };
-        ereporter.try_send_ereport(&ereport);
+        ereporter.deliver_ereport(&ereport);
         // TODO(eliza): if POWER_GOOD has been deasserted, we should produce a
         // subsequent ereport for that.
 

diff --git a/drv/psc-seq-server/Cargo.toml b/drv/psc-seq-server/Cargo.toml
@@ -14,7 +14,7 @@ task-packrat-api = { path = "../../task/packrat-api", features = ["microcbor"] }
 userlib = { path = "../../sys/userlib", features = ["panic-messages"] }
 ringbuf = { path = "../../lib/ringbuf", features = ["counters"] }
 counters = { path = "../../lib/counters" }
-ereports = { path = "../../lib/ereports" }
+ereports = { path = "../../lib/ereports", features = ["ereporter-macro"] }
 static-cell = { path = "../../lib/static-cell" }
 microcbor.path = "../../lib/microcbor"
 fixedstr = { path = "../../lib/fixedstr", features = ["microcbor"] }