New reset-with-watchdog semantics

oxidecomputer · Apr 5, 2024 · c5ee27b · c5ee27b
1 parent 493860e
commit c5ee27b
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/task/control-plane-agent/src/mgs_common.rs b/task/control-plane-agent/src/mgs_common.rs
@@ -473,12 +473,16 @@ impl MgsCommon {
         Ok(cnt)
     }
 
-    pub(crate) fn enable_sp_slot_watchdog(
+    pub(crate) fn reset_with_watchdog(
         &mut self,
         time_ms: u32,
-    ) -> Result<(), SpError> {
+    ) -> Result<core::convert::Infallible, SpError> {
+        if self.reset_component_requested != Some(SpComponent::SP_ITSELF) {
+            return Err(SpError::ResetComponentTriggerWithoutPrepare);
+        }
         self.sprot.enable_sp_slot_watchdog(time_ms)?;
-        Ok(())
+        task_jefe_api::Jefe::from(crate::JEFE.get_task_id()).request_reset();
+        panic!(); // we really really shouldn't get here
     }
 
     pub(crate) fn disable_sp_slot_watchdog(&mut self) -> Result<(), SpError> {

diff --git a/task/control-plane-agent/src/mgs_gimlet.rs b/task/control-plane-agent/src/mgs_gimlet.rs
@@ -20,7 +20,7 @@ use gateway_messages::{
     DiscoverResponse, Header, IgnitionCommand, IgnitionState, Message,
     MessageKind, MgsError, PowerState, RotRequest, RotResponse, SensorRequest,
     SensorResponse, SpComponent, SpError, SpPort, SpRequest, SpStateV2,
-    SpUpdatePrepare, UpdateChunk, UpdateId, UpdateStatus,
+    SpUpdatePrepare, UpdateChunk, UpdateId, UpdateStatus, WatchdogError,
     SERIAL_CONSOLE_IDLE_TIMEOUT,
 };
 use heapless::{Deque, Vec};
@@ -1112,8 +1112,14 @@ impl SpHandler for MgsHandler {
         self.common.vpd_lock_status_all(buf)
     }
 
-    fn enable_sp_slot_watchdog(&mut self, time_ms: u32) -> Result<(), SpError> {
-        self.common.enable_sp_slot_watchdog(time_ms)
+    fn reset_with_watchdog(
+        &mut self,
+        time_ms: u32,
+    ) -> Result<core::convert::Infallible, SpError> {
+        if !matches!(self.sp_update.status(), UpdateStatus::Complete(..)) {
+            return Err(SpError::Watchdog(WatchdogError::NoCompletedUpdate));
+        }
+        self.common.reset_with_watchdog(time_ms)
     }
 
     fn disable_sp_slot_watchdog(&mut self) -> Result<(), SpError> {

diff --git a/task/control-plane-agent/src/mgs_psc.rs b/task/control-plane-agent/src/mgs_psc.rs
@@ -650,8 +650,14 @@ impl SpHandler for MgsHandler {
         self.common.vpd_lock_status_all(buf)
     }
 
-    fn enable_sp_slot_watchdog(&mut self, time_ms: u32) -> Result<(), SpError> {
-        self.common.enable_sp_slot_watchdog(time_ms)
+    fn reset_with_watchdog(
+        &mut self,
+        time_ms: u32,
+    ) -> Result<core::convert::Infallible, SpError> {
+        if !matches!(self.sp_update.status(), UpdateStatus::Complete(..)) {
+            return Err(SpError::Watchdog(WatchdogError::NoCompletedUpdate));
+        }
+        self.common.reset_with_watchdog(time_ms)
     }
 
     fn disable_sp_slot_watchdog(&mut self) -> Result<(), SpError> {

diff --git a/task/control-plane-agent/src/mgs_sidecar.rs b/task/control-plane-agent/src/mgs_sidecar.rs
@@ -759,8 +759,14 @@ impl SpHandler for MgsHandler {
         self.common.vpd_lock_status_all(buf)
     }
 
-    fn enable_sp_slot_watchdog(&mut self, time_ms: u32) -> Result<(), SpError> {
-        self.common.enable_sp_slot_watchdog(time_ms)
+    fn reset_with_watchdog(
+        &mut self,
+        time_ms: u32,
+    ) -> Result<core::convert::Infallible, SpError> {
+        if !matches!(self.sp_update.status(), UpdateStatus::Complete(..)) {
+            return Err(SpError::Watchdog(WatchdogError::NoCompletedUpdate));
+        }
+        self.common.reset_with_watchdog(time_ms)
     }
 
     fn disable_sp_slot_watchdog(&mut self) -> Result<(), SpError> {