[nrf fromlist] soc: Boot matching radio slot

Upstream PR #: 92033

If the application uses slot 1 (i.e. in Direct XIP mode),
boot radio slot 1 instead of slot 0.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
(cherry picked from commit 1f56dd0ebdd9d1e763cbf539edd29e24b0a74c58)

Author: tomchy

soc/nordic/nrf54h/soc.c

@@ -32,6 +32,15 @@ LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 #define HSFLL_NODE DT_NODELABEL(cpurad_hsfll)
 #endif
 
+#ifdef CONFIG_USE_DT_CODE_PARTITION
+#define FLASH_LOAD_OFFSET DT_REG_ADDR(DT_CHOSEN(zephyr_code_partition))
+#elif defined(CONFIG_FLASH_LOAD_OFFSET)
+#define FLASH_LOAD_OFFSET CONFIG_FLASH_LOAD_OFFSET
+#endif
+
+#define PARTITION_IS_RUNNING_APP_PARTITION(label)                                                  \
+	(DT_REG_ADDR(DT_NODELABEL(label)) == FLASH_LOAD_OFFSET)
+
 sys_snode_t soc_node;
 
 #define FICR_ADDR_GET(node_id, name)                                           \
@@ -44,8 +53,6 @@ sys_snode_t soc_node;
 				      ADDRESS_DOMAIN_Msk |                     \
 				      ADDRESS_BUS_Msk)))
 
-#define DT_NODELABEL_CPURAD_SLOT0_PARTITION DT_NODELABEL(cpurad_slot0_partition)
-
 static void power_domain_init(void)
 {
 	/*
@@ -172,11 +179,26 @@ void soc_late_init_hook(void)
 	 */
 	uint8_t *msg = NULL;
 	size_t msg_size = 0;
-
-	void *radiocore_address =
-		(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL_CPURAD_SLOT0_PARTITION)) +
-			 DT_REG_ADDR(DT_NODELABEL_CPURAD_SLOT0_PARTITION) +
+	void *radiocore_address = NULL;
+
+#if DT_NODE_EXISTS(DT_NODELABEL(cpurad_slot1_partition))
+	if (PARTITION_IS_RUNNING_APP_PARTITION(slot1_partition)) {
+		radiocore_address =
+			(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL(cpurad_slot1_partition))) +
+				 DT_REG_ADDR(DT_NODELABEL(cpurad_slot1_partition)) +
+				 CONFIG_ROM_START_OFFSET);
+	} else {
+		radiocore_address =
+			(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL(cpurad_slot0_partition))) +
+				 DT_REG_ADDR(DT_NODELABEL(cpurad_slot0_partition)) +
+				 CONFIG_ROM_START_OFFSET);
+	}
+#else
+	radiocore_address =
+		(void *)(DT_REG_ADDR(DT_GPARENT(DT_NODELABEL(cpurad_slot0_partition))) +
+			 DT_REG_ADDR(DT_NODELABEL(cpurad_slot0_partition)) +
 			 CONFIG_ROM_START_OFFSET);
+#endif
 
 	if (IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD_ENABLE_CHECK_VTOR) &&
 	    sys_read32((mem_addr_t)radiocore_address) == 0xFFFFFFFFUL) {