west_commands: ncs_ironside_se_update: fix various issues

Only use the --x-sdfw-variant option when it is supported by nrfutil,
since it is not available in all versions of nrfutil-device.
The program helptext is used to determine if it is supported.

Add an explicit 'nrfutil device recover' ahead of the update,
which seems to be necessary in some cases.

Fix an issue where the wrong update status was logged after
the update of a slot.

Signed-off-by: Jonathan Nilsen <[email protected]>

Author: jonathannilsen

scripts/west_commands/ncs_ironside_se_update.py

@@ -125,9 +125,11 @@ def do_add_parser(self, parser_adder: Any) -> argparse.ArgumentParser:
         return parser
 
     def do_run(self, args: argparse.Namespace, unknown: list[str]) -> None:
+        has_x_sdfw_variant = self._nrfutil_supports_sdfw_variant()
         common_kwargs = {
             "serial_number": args.serial_number,
             "wait_time": args.wait_time,
+            "sdfw_variant": "ironside" if has_x_sdfw_variant else None,
         }
 
         if not args.allow_erase:
@@ -185,6 +187,9 @@ def do_run(self, args: argparse.Namespace, unknown: list[str]) -> None:
                     f"Updating IronSide SE firmware:\n{indent(target_version_diff, '  ')}\n"
                 )
 
+                self.inf("Erasing non-volatile memory")
+                self._nrfutil_device("recover", **common_kwargs)
+
                 self.dbg("Programming application firmware used to trigger the update")
                 self._program(update_app, erase=True, **common_kwargs)
 
@@ -220,7 +225,7 @@ def do_run(self, args: argparse.Namespace, unknown: list[str]) -> None:
                     slot_version = self._read_firmware_version(slot, **common_kwargs)
                     last_update_status = self._read_update_status(**common_kwargs)
                     self.dbg(
-                        f"Version after update: {slot_version}, status: {update_status.name}"
+                        f"Version after update: {slot_version}, status: {last_update_status.name}"
                     )
 
                     if slot_version != slot_target_version:
@@ -276,20 +281,24 @@ def _nrfutil_device(
         self,
         cmd: str,
         serial_number: str | None = None,
+        sdfw_variant: str | None = None,
         die_on_error: bool = True,
+        dbg_log_stdout: bool = True,
         **kwargs: Any,
     ) -> str:
+        optional_args = ""
         if serial_number is not None:
-            optional_args = f" --serial-number {serial_number}"
-        else:
-            optional_args = ""
+            optional_args += f" --serial-number {serial_number}"
+        if sdfw_variant is not None:
+            optional_args += f"  --x-sdfw-variant {sdfw_variant}"
 
-        cmd = f"nrfutil device {cmd}{optional_args} --x-sdfw-variant ironside"
+        cmd = f"nrfutil device {cmd}{optional_args}"
         self.dbg(cmd)
 
         result = subprocess.run(cmd, shell=True, text=True, capture_output=True)
 
-        self.dbg(result.stdout)
+        if dbg_log_stdout:
+            self.dbg(result.stdout)
 
         if result.returncode != 0:
             if die_on_error:
@@ -311,6 +320,13 @@ def _nrfutil_read(self, address: int, num_bytes: int, **kwargs: Any) -> bytes:
         )
         return bytes(json_out["devices"][0]["memoryData"][0]["values"])
 
+    def _nrfutil_supports_sdfw_variant(self) -> bool:
+        nrfutil_device_program_helptext = self._nrfutil_device(
+            "program --help",
+            dbg_log_stdout=False,
+        )
+        return "--x-sdfw-variant" in nrfutil_device_program_helptext
+
     def _wait_for_bootstatus(self, wait_time: float, **kwargs: Any) -> int:
         boot_status = None
         start = time.perf_counter()