[nrf fromtree] soc: nordic: uicr: Add support for UICR.WDTSTART

Add support for UICR.WDTSTART.

UICR.WDTSTART configures the automatic start of a local watchdog timer
before the application core is booted. This provides early system
protection ensuring that the system can recover from early boot
failures.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit af32ebd)

Author: SebastianBoe

scripts/ci/check_compliance.py

@@ -1351,12 +1351,18 @@ def check_no_undef_outside_kconfig(self, kconf):
         "FOO_SETTING_1",
         "FOO_SETTING_2",
         "GEN_UICR_GENERATE_PERIPHCONF", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_PROTECTEDMEM", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_PROTECTEDMEM_SIZE_BYTES", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_SECONDARY", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_SECONDARY_GENERATE_PERIPHCONF", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_SECONDARY_PROCESSOR_VALUE", # Used in specialized build tool, not part of main Kconfig
-        "GEN_UICR_SECURESTORAGE", # Used in specialized build tool, not part of main Kconfig
+        "GEN_UICR_PROTECTEDMEM",
+        "GEN_UICR_PROTECTEDMEM_SIZE_BYTES",
+        "GEN_UICR_SECONDARY",
+        "GEN_UICR_SECONDARY_GENERATE_PERIPHCONF",
+        "GEN_UICR_SECONDARY_PROCESSOR_VALUE",
+        "GEN_UICR_SECONDARY_WDTSTART",
+        "GEN_UICR_SECONDARY_WDTSTART_CRV",
+        "GEN_UICR_SECONDARY_WDTSTART_INSTANCE_CODE",
+        "GEN_UICR_SECURESTORAGE",
+        "GEN_UICR_WDTSTART",
+        "GEN_UICR_WDTSTART_CRV",
+        "GEN_UICR_WDTSTART_INSTANCE_CODE",
         "HEAP_MEM_POOL_ADD_SIZE_", # Used as an option matching prefix
         "HUGETLBFS",          # Linux, in boards/xtensa/intel_adsp_cavs25/doc
         "IAR_BUFFERED_WRITE",

soc/nordic/common/uicr/gen_uicr.py

@@ -440,6 +440,36 @@ def main() -> None:
         type=int,
         help="Protected memory size in bytes (must be divisible by 4096)",
     )
+    parser.add_argument(
+        "--wdtstart",
+        action="store_true",
+        help="Enable watchdog timer start in UICR",
+    )
+    parser.add_argument(
+        "--wdtstart-instance-code",
+        type=lambda s: int(s, 0),
+        help="Watchdog timer instance code (0xBD2328A8 for WDT0, 0x1730C77F for WDT1)",
+    )
+    parser.add_argument(
+        "--wdtstart-crv",
+        type=int,
+        help="Initial Counter Reload Value (CRV) for watchdog timer (minimum: 0xF)",
+    )
+    parser.add_argument(
+        "--secondary-wdtstart",
+        action="store_true",
+        help="Enable watchdog timer start in UICR.SECONDARY",
+    )
+    parser.add_argument(
+        "--secondary-wdtstart-instance-code",
+        type=lambda s: int(s, 0),
+        help="Secondary watchdog timer instance code (0xBD2328A8 for WDT0, 0x1730C77F for WDT1)",
+    )
+    parser.add_argument(
+        "--secondary-wdtstart-crv",
+        type=int,
+        help="Secondary initial Counter Reload Value (CRV) for watchdog timer (minimum: 0xF)",
+    )
     parser.add_argument(
         "--secondary",
         action="store_true",
@@ -557,6 +587,12 @@ def main() -> None:
             uicr.PROTECTEDMEM.ENABLE = ENABLED_VALUE
             uicr.PROTECTEDMEM.SIZE4KB = args.protectedmem_size_bytes // KB_4
 
+        # Handle WDTSTART configuration
+        if args.wdtstart:
+            uicr.WDTSTART.ENABLE = ENABLED_VALUE
+            uicr.WDTSTART.CRV = args.wdtstart_crv
+            uicr.WDTSTART.INSTANCE = args.wdtstart_instance_code
+
         # Process periphconf data first and configure UICR completely before creating hex objects
         periphconf_hex = IntelHex()
         secondary_periphconf_hex = IntelHex()
@@ -625,6 +661,12 @@ def main() -> None:
 
                 uicr.SECONDARY.PERIPHCONF.MAXCOUNT = args.secondary_periphconf_size // 8
 
+            # Handle secondary WDTSTART configuration
+            if args.secondary_wdtstart:
+                uicr.SECONDARY.WDTSTART.ENABLE = ENABLED_VALUE
+                uicr.SECONDARY.WDTSTART.CRV = args.secondary_wdtstart_crv
+                uicr.SECONDARY.WDTSTART.INSTANCE = args.secondary_wdtstart_instance_code
+
         # Create UICR hex object with final UICR data
         uicr_hex = IntelHex()
         uicr_hex.frombytes(bytes(uicr), offset=args.uicr_address)

soc/nordic/common/uicr/gen_uicr/CMakeLists.txt

@@ -77,6 +77,7 @@ endif()
 
 set(protectedmem_args)
 set(periphconf_args)
+set(wdtstart_args)
 set(periphconf_elfs)
 set(merged_hex_file ${APPLICATION_BINARY_DIR}/zephyr/${CONFIG_KERNEL_BIN_NAME}.hex)
 set(secondary_periphconf_elfs)
@@ -120,6 +121,13 @@ if(CONFIG_GEN_UICR_PROTECTEDMEM)
   list(APPEND protectedmem_args --protectedmem-size-bytes ${CONFIG_GEN_UICR_PROTECTEDMEM_SIZE_BYTES})
 endif()
 
+# Handle WDTSTART configuration
+if(CONFIG_GEN_UICR_WDTSTART)
+  list(APPEND wdtstart_args --wdtstart)
+  list(APPEND wdtstart_args --wdtstart-instance-code ${CONFIG_GEN_UICR_WDTSTART_INSTANCE_CODE})
+  list(APPEND wdtstart_args --wdtstart-crv ${CONFIG_GEN_UICR_WDTSTART_CRV})
+endif()
+
 if(CONFIG_GEN_UICR_GENERATE_PERIPHCONF)
   # gen_uicr.py parses all zephyr.elf files. To find these files (which
   # have not been built yet) we scan sibling build directories for
@@ -173,6 +181,13 @@ if(CONFIG_GEN_UICR_SECONDARY)
     --secondary-processor ${CONFIG_GEN_UICR_SECONDARY_PROCESSOR_VALUE}
     )
 
+  # Handle secondary WDTSTART configuration
+  if(CONFIG_GEN_UICR_SECONDARY_WDTSTART)
+    list(APPEND secondary_args --secondary-wdtstart)
+    list(APPEND secondary_args --secondary-wdtstart-instance-code ${CONFIG_GEN_UICR_SECONDARY_WDTSTART_INSTANCE_CODE})
+    list(APPEND secondary_args --secondary-wdtstart-crv ${CONFIG_GEN_UICR_SECONDARY_WDTSTART_CRV})
+  endif()
+
   if(CONFIG_GEN_UICR_SECONDARY_GENERATE_PERIPHCONF)
     # Compute SECONDARY_PERIPHCONF absolute address and size from this image's devicetree
     compute_partition_address_and_size("secondary_periphconf_partition" SECONDARY_PERIPHCONF_ADDRESS SECONDARY_PERIPHCONF_SIZE)
@@ -195,6 +210,7 @@ add_custom_command(
           --uicr-address ${UICR_ADDRESS}
           --out-merged-hex ${merged_hex_file}
           --out-uicr-hex ${uicr_hex_file}
+          ${wdtstart_args}
           ${periphconf_args}
           ${securestorage_args}
           ${protectedmem_args}

soc/nordic/common/uicr/gen_uicr/Kconfig

@@ -46,6 +46,93 @@ config GEN_UICR_PROTECTEDMEM_SIZE_BYTES
 	  Size of the protected memory region in bytes.
 	  This value must be divisible by 4096 (4 kiB).
 
+config GEN_UICR_WDTSTART
+	bool "Enable UICR.WDTSTART"
+	help
+	  When enabled, the UICR generator will configure an application
+	  domain watchdog timer to start automatically before the
+	  application core is booted.
+
+choice GEN_UICR_WDTSTART_INSTANCE
+	prompt "Watchdog timer instance"
+	depends on GEN_UICR_WDTSTART
+	default GEN_UICR_WDTSTART_INSTANCE_WDT0
+	help
+	  Select which watchdog timer instance to use.
+
+config GEN_UICR_WDTSTART_INSTANCE_WDT0
+	bool "WDT0"
+	help
+	  Use watchdog timer instance 0.
+
+config GEN_UICR_WDTSTART_INSTANCE_WDT1
+	bool "WDT1"
+	help
+	  Use watchdog timer instance 1.
+
+endchoice
+
+config GEN_UICR_WDTSTART_INSTANCE_CODE
+	hex
+	default 0xBD2328A8 if GEN_UICR_WDTSTART_INSTANCE_WDT0
+	default 0x1730C77F if GEN_UICR_WDTSTART_INSTANCE_WDT1
+	depends on GEN_UICR_WDTSTART
+
+config GEN_UICR_WDTSTART_CRV
+	int "Initial Counter Reload Value (CRV)"
+	default 65535
+	range 15 4294967295
+	depends on GEN_UICR_WDTSTART
+	help
+	  Initial Counter Reload Value (CRV) for the watchdog timer.
+	  This value determines the watchdog timeout period.
+	  Must be at least 15 (0xF) to ensure proper watchdog operation.
+	  Default value 65535 creates a 2-second timeout.
+
+config GEN_UICR_SECONDARY_WDTSTART
+	bool "Enable UICR.SECONDARY.WDTSTART"
+	depends on GEN_UICR_SECONDARY
+	help
+	  When enabled, the UICR generator will configure the
+	  watchdog timer to start automatically before the
+	  secondary firmware is booted.
+
+choice GEN_UICR_SECONDARY_WDTSTART_INSTANCE
+	prompt "Secondary watchdog timer instance"
+	depends on GEN_UICR_SECONDARY_WDTSTART
+	default GEN_UICR_SECONDARY_WDTSTART_INSTANCE_WDT0
+	help
+	  Select which watchdog timer instance to use for secondary firmware.
+
+config GEN_UICR_SECONDARY_WDTSTART_INSTANCE_WDT0
+	bool "WDT0"
+	help
+	  Use watchdog timer instance 0 for secondary firmware.
+
+config GEN_UICR_SECONDARY_WDTSTART_INSTANCE_WDT1
+	bool "WDT1"
+	help
+	  Use watchdog timer instance 1 for secondary firmware.
+
+endchoice
+
+config GEN_UICR_SECONDARY_WDTSTART_INSTANCE_CODE
+	hex
+	default 0xBD2328A8 if GEN_UICR_SECONDARY_WDTSTART_INSTANCE_WDT0
+	default 0x1730C77F if GEN_UICR_SECONDARY_WDTSTART_INSTANCE_WDT1
+	depends on GEN_UICR_SECONDARY_WDTSTART
+
+config GEN_UICR_SECONDARY_WDTSTART_CRV
+	int "Secondary initial Counter Reload Value (CRV)"
+	default 65535
+	range 15 4294967295
+	depends on GEN_UICR_SECONDARY_WDTSTART
+	help
+	  Initial Counter Reload Value (CRV) for the secondary watchdog timer.
+	  This value determines the watchdog timeout period.
+	  Must be at least 15 (0xF) to ensure proper watchdog operation.
+	  Default value 65535 creates a 2-second timeout.
+
 config GEN_UICR_SECONDARY
 	bool "Enable UICR.SECONDARY.ENABLE"