Satisfy updated compiler regarding write to static mut

Author: lzrd

Cargo.lock

@@ -146,7 +146,7 @@ zip = { version = "0.6", default-features = false, features = ["bzip2", "deflate
 # Oxide forks and repos
 attest-data = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.4.0" }
 dice-mfg-msgs = { git = "https://github.com/oxidecomputer/dice-util", default-features = false, version = "0.2.1" }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"] }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false, features = ["smoltcp"], rev = "ef7ce28f349dca6774b931bb169690e908e3eecd" }
 gateway-ereport-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", default-features = false }
 gimlet-inspector-protocol = { git = "https://github.com/oxidecomputer/gimlet-inspector-protocol", version = "0.1.0" }
 hif = { git = "https://github.com/oxidecomputer/hif", default-features = false }

Cargo.toml

@@ -12,6 +12,7 @@
 use core::convert::Infallible;
 use core::mem::MaybeUninit;
 use core::ops::Range;
+use core::ptr;
 use drv_lpc55_flash::{BYTES_PER_FLASH_PAGE, BYTES_PER_FLASH_WORD};
 use drv_lpc55_update_api::{
     Fwid, RawCabooseError, RotBootInfo, RotBootInfoV2, RotComponent, RotPage,
@@ -41,6 +42,9 @@ const PAGE_SIZE: u32 = BYTES_PER_FLASH_PAGE as u32;
 #[link_section = ".bootstate"]
 static BOOTSTATE: MaybeUninit<[u8; 0x1000]> = MaybeUninit::uninit();
 
+// The TRANSIENT_OVERRIDE field is always initialized.
+// It contains either the Bootleby BootDecisionLog or one of our
+// settings/clearings of the transient override preference.
 #[used]
 #[link_section = ".transient_override"]
 static mut TRANSIENT_OVERRIDE: MaybeUninit<[u8; 32]> = MaybeUninit::uninit();
@@ -1478,7 +1482,10 @@ fn set_transient_override(preference: [u8; 32]) {
     // Calling this function multiple times is ok.
     // Bootleby is careful to vet contents before acting.
     unsafe {
-        TRANSIENT_OVERRIDE.write(preference);
+        ptr::write_volatile(
+            ptr::addr_of_mut!(TRANSIENT_OVERRIDE),
+            MaybeUninit::new(preference),
+        );
     }
 }
 

drv/lpc55-update-server/src/main.rs

@@ -67,8 +67,8 @@ pub enum UpdateError {
     VersionNotSupported,
 
     InvalidPreferredSlotId,
-    // AlreadyPending,
-    // NonePending,
+    AlreadyPending,
+    NonePending,
 }
 
 impl From<UpdateError> for GwUpdateError {
@@ -108,8 +108,8 @@ impl From<UpdateError> for GwUpdateError {
             UpdateError::SignatureNotValidated => Self::SignatureNotValidated,
             UpdateError::VersionNotSupported => Self::VersionNotSupported,
             UpdateError::InvalidPreferredSlotId => Self::InvalidPreferredSlotId,
-            // UpdateError::AlreadyPending => Self::AlreadyPending,
-            // UpdateError::NonePending => Self::NonePending,
+            UpdateError::AlreadyPending => Self::AlreadyPending,
+            UpdateError::NonePending => Self::NonePending,
         }
     }
 }

drv/update-api/src/lib.rs

@@ -708,6 +708,12 @@ impl MgsCommon {
             HIGHEST_KNOWN_ROT_VERSION
         );
 
+        // Force update if the MGS and ROT default mapping is not correct.
+        static_assertions::const_assert_eq!(
+            GwRotBootInfo::HIGHEST_KNOWN_VERSION - 1,
+            SpVersionedRotBootInfo::HIGHEST_KNOWN_VERSION,
+        );
+
         // Map the MGS RotBootInfo 1-based versions to RoT 0-based versions.
         let rot_version = match version {
             // There is no version -1 in the RoT version number scheme.