Switch to active / inactive / scratch pages

oxidecomputer · Sep 7, 2023 · 39455d6 · 39455d6
1 parent db88706
commit 39455d6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/faux-mgs/src/main.rs b/faux-mgs/src/main.rs
@@ -376,7 +376,8 @@ enum LedCommand {
 #[derive(ValueEnum, Debug, Clone)]
 enum CfpaSlot {
     Active,
-    Pending,
+    Inactive,
+    Scratch,
 }
 
 impl std::fmt::Display for CfpaSlot {
@@ -389,7 +390,8 @@ impl std::fmt::Display for CfpaSlot {
             "{}",
             match self {
                 CfpaSlot::Active => "active",
-                CfpaSlot::Pending => "pending",
+                CfpaSlot::Inactive => "inactive",
+                CfpaSlot::Scratch => "scratch",
             }
         )
     }
@@ -1266,7 +1268,8 @@ async fn run_command(
         Command::ReadCfpa { out, slot } => {
             let data = match slot {
                 CfpaSlot::Active => sp.read_rot_active_cfpa().await,
-                CfpaSlot::Pending => sp.read_rot_pending_cfpa().await,
+                CfpaSlot::Inactive => sp.read_rot_inactive_cfpa().await,
+                CfpaSlot::Scratch => sp.read_rot_scratch_cfpa().await,
             }?;
             handle_cxpa("cfpa", data, out, json)
         }

diff --git a/gateway-messages/src/lib.rs b/gateway-messages/src/lib.rs
@@ -241,9 +241,10 @@ pub enum RotRequest {
 pub enum CfpaPage {
     /// Currently active page
     Active,
-    /// Page that will become active on reset
-    Pending,
-    // We could add variants for ping/pong/scratch pages here if needed
+    /// Currently inactive page
+    Inactive,
+    /// Page that may become active upon reset
+    Scratch,
 }
 
 #[derive(

diff --git a/gateway-messages/tests/versioning/v9.rs b/gateway-messages/tests/versioning/v9.rs
@@ -48,5 +48,6 @@ fn cfpa_page() {
     let mut out = [0; CfpaPage::MAX_SIZE];
 
     assert_serialized(&mut out, &[0], &CfpaPage::Active);
-    assert_serialized(&mut out, &[1], &CfpaPage::Pending);
+    assert_serialized(&mut out, &[1], &CfpaPage::Inactive);
+    assert_serialized(&mut out, &[2], &CfpaPage::Scratch);
 }
diff --git a/gateway-sp-comms/src/single_sp.rs b/gateway-sp-comms/src/single_sp.rs
@@ -830,8 +830,14 @@ impl SingleSp {
             .and_then(expect_read_rot)
     }
 
-    pub async fn read_rot_pending_cfpa(&self) -> Result<[u8; ROT_PAGE_SIZE]> {
-        self.rpc(MgsRequest::ReadRot(RotRequest::ReadCfpa(CfpaPage::Pending)))
+    pub async fn read_rot_inactive_cfpa(&self) -> Result<[u8; ROT_PAGE_SIZE]> {
+        self.rpc(MgsRequest::ReadRot(RotRequest::ReadCfpa(CfpaPage::Inactive)))
+            .await
+            .and_then(expect_read_rot)
+    }
+
+    pub async fn read_rot_scratch_cfpa(&self) -> Result<[u8; ROT_PAGE_SIZE]> {
+        self.rpc(MgsRequest::ReadRot(RotRequest::ReadCfpa(CfpaPage::Scratch)))
             .await
             .and_then(expect_read_rot)
     }