[nrf fromlist] boards: nrf53: config EXTDOMAIN in soc to reduce code duplication

SebastianBoe · SebastianBoe · commit e2cb1f95f518 · 2024-05-29T10:53:03.000+02:00
Configure the "cpunet" to be secure from the soc system initialization
to avoid code duplication across all the boards.

cpunet is now configured to be secure earlier in the boot process,
from POST_KERNEL to PRE_KERNEL, but AFAIK this is not a problem.

Signed-off-by: Sebastian Bøe &lt;sebastian.boe@nordicsemi.no&gt;
diff --git a/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c b/boards/lairdconnect/bl5340_dvk/bl5340_dvk_nrf5340_cpunet_reset.c
@@ -26,18 +26,10 @@ static void remoteproc_mgr_config(void)
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
 }
 
 static int remoteproc_mgr_boot(void)
 {
-
 	/* Secure domain may configure permissions for the Network MCU. */
 	remoteproc_mgr_config();
 
diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_cpunet_reset.c
@@ -40,20 +40,12 @@ static void remoteproc_mgr_config(void)
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
 }
 
 static int remoteproc_mgr_boot(void)
 {
 	int ret;
 
-
 	ret = core_config();
 	if (ret) {
 		return ret;
diff --git a/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c b/boards/nordic/nrf5340dk/nrf5340_cpunet_reset.c
@@ -25,13 +25,6 @@ static void remoteproc_mgr_config(void)
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
 }
 
 static int remoteproc_mgr_boot(void)
diff --git a/boards/nordic/thingy53/board.c b/boards/nordic/thingy53/board.c
@@ -36,13 +36,6 @@ BUILD_ASSERT(CONFIG_THINGY53_INIT_PRIORITY < CONFIG_SENSOR_INIT_PRIORITY,
 
 static void enable_cpunet(void)
 {
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !CONFIG_TRUSTED_EXECUTION_NONSECURE */
-
 #if !defined(CONFIG_TRUSTED_EXECUTION_SECURE)
 	/*
 	 * Building Zephyr with CONFIG_TRUSTED_EXECUTION_SECURE=y implies
diff --git a/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c b/boards/panasonic/pan1783/pan1783_nrf5340_cpunet_reset.c
@@ -31,9 +31,6 @@ static void remoteproc_mgr_config(void)
 {
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
-
-	/* Retain nRF5340 Network MCU */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
 }
 
 static int remoteproc_mgr_boot(void)
diff --git a/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_reset.c b/boards/raytac/mdbt53_db_40/raytac_mdbt53_db_40_nrf5340_cpunet_reset.c
@@ -26,13 +26,6 @@ static void remoteproc_mgr_config(void)
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
 }
 
 static int remoteproc_mgr_boot(const struct device *dev)
diff --git a/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_reset.c b/boards/raytac/mdbt53v_db_40/raytac_mdbt53v_db_40_nrf5340_cpunet_reset.c
@@ -25,13 +25,6 @@ static void remoteproc_mgr_config(void)
 	/* Route Bluetooth Controller Debug Pins */
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
-
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
 }
 
 static int remoteproc_mgr_boot(const struct device *dev)
diff --git a/drivers/bluetooth/hci/nrf53_support.c b/drivers/bluetooth/hci/nrf53_support.c
@@ -35,13 +35,6 @@ int bt_hci_transport_setup(const struct device *dev)
 	DEBUG_SETUP();
 #endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(CONFIG_BUILD_WITH_TFM) */
 
-#if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
-	/* Retain nRF5340 Network MCU in Secure domain (bus
-	 * accesses by Network MCU will have Secure attribute set).
-	 */
-	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
-#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
-
 	/* Release the Network MCU, 'Release force off signal' */
 	nrf53_cpunet_enable(true);
 
diff --git a/soc/nordic/nrf53/soc.c b/soc/nordic/nrf53/soc.c
@@ -563,6 +563,17 @@ static int nordicsemi_nrf53_init(void)
 	nrf_regulators_vreg_enable_set(NRF_REGULATORS, NRF_REGULATORS_VREG_HIGH, true);
 #endif
 
+#if defined(NRF_SPU) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)
+	/* Retain nRF5340 Network MCU in Secure domain (bus
+	 * accesses by Network MCU will have Secure attribute set).
+	 *
+	 * Note that this source file is also used for the network core,
+	 * which doesn't have an SPU, so we ifdef on NRF_SPU being
+	 * available.
+	 */
+	NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;
+#endif /* !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) */
+
 #if defined(CONFIG_SOC_NRF_GPIO_FORWARDER_FOR_NRF5340)
 	static const uint8_t forwarded_psels[] = {
 		DT_FOREACH_STATUS_OKAY(nordic_nrf_gpio_forwarder, ALL_GPIOS_IN_FORWARDER)

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,6 @@ static void remoteproc_mgr_config(void)`
`31`	`31`	`{`
`32`	`32`	`/* Route Bluetooth Controller Debug Pins */`
`33`	`33`	`DEBUG_SETUP();`
`34`		`-`
`35`		`- /* Retain nRF5340 Network MCU */`
`36`		`- NRF_SPU->EXTDOMAIN[0].PERM = 1 << 4;`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`static int remoteproc_mgr_boot(void)`