Fix LPC55 resetting from ISP mode

cmd/reset/src/lib.rs

@@ -55,6 +55,7 @@ fn reset(context: &mut ExecutionContext) -> Result<()> {
                 // Detect bogus archives by looking at the chip member
                 if let Some(archive) = &context.archive
                     && chip.is_some()
+                    && archive.wants_reset_handoff_token()
                 {
                     Behavior::ResetWithHandoff(archive)
                 } else {
@@ -66,6 +67,12 @@ fn reset(context: &mut ExecutionContext) -> Result<()> {
                 if let Some(archive) = &context.archive
                     && chip.is_some()
                 {
+                    if !archive.wants_reset_handoff_token() {
+                        anyhow::bail!(
+                            "--use-token=true was specified, but the archive \
+                             does not have the relevant kernel feature"
+                        );
+                    }
                     Behavior::ResetWithHandoff(archive)
                 } else {
                     anyhow::bail!(

humility-bin/Cargo.toml

@@ -18,7 +18,7 @@
 [package]
 name = "humility-bin"
 edition.workspace = true
-version = "0.12.9"
+version = "0.12.10"
 license = "MPL-2.0"
 
 [build-dependencies]

humility-bin/tests/cmd/chip.trycmd

@@ -13,7 +13,7 @@ For more information try --help
 
 ```
 $ humility --chip this-can-be-anything -V
-humility 0.12.9 
+humility 0.12.10 
 
 ```
 
@@ -28,7 +28,7 @@ For more information try --help
 
 ```
 $ humility -c apx432 -V
-humility 0.12.9 
+humility 0.12.10 
 
 ```
 

humility-bin/tests/cmd/version.trycmd

@@ -2,14 +2,14 @@ Long version flag:
 
 ```
 $ humility --version
-humility 0.12.9 
+humility 0.12.10 
 
 ```
 
 Short version flag:
 
 ```
 $ humility -V
-humility 0.12.9 
+humility 0.12.10 
 
 ```

humility-core/src/core.rs

@@ -78,7 +78,7 @@ pub trait Core {
     /// the `measurement-token` crate in `lpc55_support`, which is also used in
     /// the SP firmware.
     fn reset_with_handoff(&mut self, hubris: &HubrisArchive) -> Result<()> {
-        if hubris.manifest.features.iter().any(|s| s == "measurement-handoff") {
+        if hubris.wants_reset_handoff_token() {
             self.reset_and_halt(std::time::Duration::from_millis(25))?;
             crate::msg!("skipping measurement token handoff");
             self.write_word_32(

humility-core/src/hubris.rs

@@ -3773,6 +3773,11 @@ impl HubrisArchive {
             .get(&pc)
             .and_then(|p| p.as_ref().map(|p| p.as_slice()))
     }
+
+    /// Returns `true` if this archive should use a reset handoff token
+    pub fn wants_reset_handoff_token(&self) -> bool {
+        self.manifest.features.iter().any(|s| s == "measurement-handoff")
+    }
 }
 
 /// Loader for a single ELF file