[nrf fromlist] soc: nordic: Add UICR.RECOVERY configuration support

Add Kconfig options to configure the UICR RECOVERY field for enabling
recovery firmware boot on Nordic Haltium SoCs. The configuration
includes settings for processor core selection (APPLICATION or
RADIOCORE), initial secure vector table offset register (INITSVTOR)
address, and recovery firmware partition size in 4KB blocks.

Upstream PR #: 91826
Signed-off-by: Sebastian Bøe <[email protected]>

Author: SebastianBoe

soc/nordic/common/uicr/Kconfig

@@ -19,6 +19,49 @@ config NRF_HALTIUM_UICR_PERIPHCONF
 	  to point at the blob. The initialization values are then loaded ahead of
 	  ahead of the application boot.
 
+config NRF_HALTIUM_UICR_RECOVERY
+	bool "Configure UICR RECOVERY field"
+	help
+	  Configure the UICR RECOVERY field to enable recovery firmware boot.
+	  This should be enabled by the main application to configure recovery
+	  firmware parameters. The recovery firmware itself does not need to
+	  enable this option.
+
+if NRF_HALTIUM_UICR_RECOVERY
+
+choice NRF_HALTIUM_UICR_RECOVERY_PROCESSOR
+	prompt "Recovery processor core"
+	default NRF_HALTIUM_UICR_RECOVERY_PROCESSOR_APPLICATION
+	help
+	  Select the processor core for recovery firmware.
+
+config NRF_HALTIUM_UICR_RECOVERY_PROCESSOR_APPLICATION
+	bool "APPLICATION (cpuapp)"
+	help
+	  Boot the APPLICATION processor core for recovery firmware.
+
+config NRF_HALTIUM_UICR_RECOVERY_PROCESSOR_RADIOCORE
+	bool "RADIOCORE (cpurad)"
+	help
+	  Boot the RADIOCORE processor core for recovery firmware.
+
+endchoice
+
+config NRF_HALTIUM_UICR_RECOVERY_INITSVTOR
+	hex "Recovery firmware INITSVTOR address"
+	help
+	  Initial value of the secure VTOR (Vector Table Offset Register)
+	  for recovery firmware. This should match the recovery firmware's
+	  memory partition address.
+
+config NRF_HALTIUM_UICR_RECOVERY_SIZE4KB
+	int "Recovery firmware size in 4KB blocks"
+	range 1 1024
+	help
+	  Size of the recovery firmware partition in 4KB blocks.
+
+endif # NRF_HALTIUM_UICR_RECOVERY
+
 endif
 
 config NRF_PERIPHCONF_SECTION

soc/nordic/common/uicr/gen_uicr.py

@@ -30,6 +30,10 @@
 ENABLED_VALUE = 0xFFFF_FFFF
 DISABLED_VALUE = 0xBD23_28A8
 
+# Recovery processor core enum values
+RECOVERY_PROCESSOR_APPLICATION = 0xBD2328A8
+RECOVERY_PROCESSOR_RADIOCORE = 0x1730C77F
+
 
 class ScriptError(RuntimeError): ...
 
@@ -197,6 +201,27 @@ def main() -> None:
             uicr.PERIPHCONF.ADDRESS = periphconf_address
             uicr.PERIPHCONF.MAXCOUNT = math.floor(periphconf_size / 8)
 
+        # Configure RECOVERY field if enabled
+        if kconfig.get("CONFIG_NRF_HALTIUM_UICR_RECOVERY") == "y":
+            uicr.RECOVERY.ENABLE = ENABLED_VALUE
+
+            # Determine processor core from choice configuration
+            if kconfig.get("CONFIG_NRF_HALTIUM_UICR_RECOVERY_PROCESSOR_APPLICATION") == "y":
+                processor = RECOVERY_PROCESSOR_APPLICATION
+            elif kconfig.get("CONFIG_NRF_HALTIUM_UICR_RECOVERY_PROCESSOR_RADIOCORE") == "y":
+                processor = RECOVERY_PROCESSOR_RADIOCORE
+            else:
+                raise ScriptError("Unreachable code")
+            uicr.RECOVERY.PROCESSOR = processor
+
+            # Get and parse INITSVTOR address
+            initsvtor = int(kconfig.get("CONFIG_NRF_HALTIUM_UICR_RECOVERY_INITSVTOR"), 0)
+            uicr.RECOVERY.INITSVTOR = initsvtor
+
+            # Get and parse size in 4KB blocks
+            size4kb = int(kconfig.get("CONFIG_NRF_HALTIUM_UICR_RECOVERY_SIZE4KB"), 0)
+            uicr.RECOVERY.SIZE4KB = size4kb
+
         try:
             uicr_node = edt.label2node[UICR_NODELABEL]
         except LookupError as e:
@@ -258,7 +283,7 @@ def extract_and_combine_periphconfs(elf_files: list[argparse.FileType]) -> bytes
 def parse_kconfig(content: str) -> dict[str, str | None]:
     result = defaultdict(None)
     match_iter = re.finditer(
-        r"^(?P<config>(SB_)?CONFIG_[^=\s]+)=(?P<value>[^\s#])+$", content, re.MULTILINE
+        r"^(?P<config>(SB_)?CONFIG_[^=\s]+)=(?P<value>[^\s#]+)$", content, re.MULTILINE
     )
     for match in match_iter:
         result[match["config"]] = match["value"]