nrfconnect · Vge0rge · Oct 30, 2024 · Nov 22, 2024 · Nov 26, 2024 · Sep 5, 2024
diff --git a/boards/nordic/nrf54h20dk/Kconfig.defconfig b/boards/nordic/nrf54h20dk/Kconfig.defconfig
@@ -6,13 +6,19 @@ if BOARD_NRF54H20DK_NRF54H20_CPUAPP
 config BT_HCI_IPC
 	default y if BT
 
+config MAX_THREAD_BYTES
+	default 3 if USERSPACE
+
 endif # BOARD_NRF54H20DK_NRF54H20_CPUAPP
 
 if BOARD_NRF54H20DK_NRF54H20_CPURAD
 
 config BT_CTLR
 	default y if BT
 
+config MAX_THREAD_BYTES
+	default 3 if USERSPACE
+
 endif # BOARD_NRF54H20DK_NRF54H20_CPURAD
 
 if BOARD_NRF54H20DK_NRF54H20_CPUPPR

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -7,44 +7,44 @@
 
 / {
 	reserved-memory {
-		cpuapp_ram0x_region: memory@2f010000 {
+		cpurad_ram0x_region: memory@2f010000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f010000 DT_SIZE_K(260)>;
+			reg = <0x2f010000 DT_SIZE_K(4)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f010000 0x41000>;
+			ranges = <0x0 0x2f010000 0x1000>;
 
-			cpusec_cpuapp_ipc_shm: memory@0 {
+			cpusec_cpurad_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_cpusec_ipc_shm: memory@800 {
+			cpurad_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
-
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
-			};
 		};
 
-		cpurad_ram0x_region: memory@2f051000 {
+		cpuapp_ram0x_region: memory@2f011000 {
 			compatible = "nordic,owned-memory";
-			reg = <0x2f051000 DT_SIZE_K(4)>;
+			reg = <0x2f011000 DT_SIZE_K(260)>;
 			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
 			#address-cells = <1>;
 			#size-cells = <1>;
-			ranges = <0x0 0x2f051000 0x1000>;
+			ranges = <0x0 0x2f011000 0x41000>;
 
-			cpusec_cpurad_ipc_shm: memory@0 {
+			cpusec_cpuapp_ipc_shm: memory@0 {
 				reg = <0x0 DT_SIZE_K(2)>;
 			};
 
-			cpurad_cpusec_ipc_shm: memory@800 {
+			cpuapp_cpusec_ipc_shm: memory@800 {
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
+
+			cpuapp_data: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(256)>;
+			};
 		};
 
 		etr_buf_ram0x_region: memory@2f0be000 {

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -27,7 +27,7 @@
 		zephyr,bt-hci = &bt_hci_ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
 		zephyr,canbus = &can120;
-		zephyr,entropy = &prng;
+		zephyr,entropy = &psa_rng;
 	};
 
 	aliases {
@@ -109,8 +109,8 @@
 		};
 	};
 
-	prng: prng {
-		compatible = "nordic,entropy-prng";
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
 		status = "okay";
 	};
 };
@@ -150,11 +150,16 @@
 };
 
 &cpusec_cpuapp_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpuapp_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpuapp_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "rx", "tx";

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts
@@ -27,22 +27,27 @@
 		zephyr,ieee802154 = &cpurad_ieee802154;
 		zephyr,bt-hci-ipc = &ipc0;
 		nordic,802154-spinel-ipc = &ipc0;
-		zephyr,entropy = &prng;
-	};
-	prng: prng {
-		compatible = "nordic,entropy-prng";
-		status = "okay";
+		zephyr,entropy = &psa_rng;
 	};
 	aliases {
 		ipc-to-cpusys = &cpurad_cpusys_ipc;
 		resetinfo = &cpurad_resetinfo;
 	};
+
+	psa_rng: psa-rng {
+		compatible = "zephyr,psa-crypto-rng";
+		status = "okay";
+	};
 };
 
 &cpuapp_cpurad_ram0x_region {
 	status = "okay";
 };
 
+&cpurad_ram0x_region {
+	status = "okay";
+};
+
 &cpurad_bellboard {
 	status = "okay";
 	interrupts = <96 NRF_DEFAULT_IRQ_PRIORITY>;
@@ -60,11 +65,16 @@
 };
 
 &cpusec_cpurad_ipc {
+	status = "okay";
 	mbox-names = "tx", "rx";
 	tx-region = <&cpurad_cpusec_ipc_shm>;
 	rx-region = <&cpusec_cpurad_ipc_shm>;
 };
 
+&cpusec_bellboard {
+	status = "okay";
+};
+
 ipc0: &cpuapp_cpurad_ipc {
 	status = "okay";
 	mbox-names = "tx", "rx";

diff --git a/drivers/entropy/Kconfig.psa_crypto b/drivers/entropy/Kconfig.psa_crypto
@@ -8,6 +8,7 @@ config ENTROPY_PSA_CRYPTO_RNG
 	depends on DT_HAS_ZEPHYR_PSA_CRYPTO_RNG_ENABLED
 	select ENTROPY_HAS_DRIVER
 	select PSA_WANT_GENERATE_RANDOM
+	select SSF_PSA_CRYPTO_SERVICE_ENABLED if (SOC_SERIES_NRF54HX && !RISCV_CORE_NORDIC_VPR)
 	default y
 	help
 	  Enable the PSA Crypto source Entropy driver.
diff --git a/soc/nordic/nrf54h/Kconfig b/soc/nordic/nrf54h/Kconfig
@@ -16,7 +16,7 @@ config SOC_NRF54H20_CPUAPP_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE
+	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
@@ -43,7 +43,7 @@ config SOC_NRF54H20_CPURAD_COMMON
 	select CPU_CORTEX_M33
 	select CPU_HAS_ARM_MPU
 	select CPU_HAS_ARM_SAU
-	select CPU_HAS_DCACHE
+	select CPU_HAS_DCACHE if !SSF_PSA_CRYPTO_SERVICE_ENABLED
 	select CPU_HAS_ICACHE
 	select CPU_HAS_FPU
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS

diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+&cpusec_cpuapp_ipc {
+	status = "disabled";
+};
+
+&cpusec_bellboard {
+	status = "disabled";
+};
diff --git a/tests/crypto/mbedtls/testcase.yaml b/tests/crypto/mbedtls/testcase.yaml
@@ -8,7 +8,10 @@ common:
   timeout: 400
 tests:
   crypto.mbedtls:
-    platform_exclude: m2gl025_miv
+    platform_exclude:
+      - m2gl025_miv
+      - nrf54h20dk/nrf54h20/cpuapp
+      - nrf54h20dk/nrf54h20/cpurad
     extra_configs:
       - CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
       - arch:riscv64:CONFIG_ZTEST_STACK_SIZE=8192

diff --git a/tests/crypto/mbedtls_psa/testcase.yaml b/tests/crypto/mbedtls_psa/testcase.yaml
@@ -17,7 +17,8 @@
 #   latter case will allow to test
 #   CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG.
 common:
-  filter: not CONFIG_BUILD_WITH_TFM
+  filter: not CONFIG_BUILD_WITH_TFM and
+          not CONFIG_PSA_SSF_CRYPTO_CLIENT
   tags:
     - mbedtls
     - psa

diff --git a/tests/crypto/secp256r1/testcase.yaml b/tests/crypto/secp256r1/testcase.yaml
@@ -3,7 +3,9 @@ common:
           CONFIG_CSPRNG_ENABLED and
           CONFIG_HARDWARE_DEVICE_CS_GENERATOR and
           not CONFIG_BUILD_WITH_TFM and
-          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT)
+          not (CONFIG_MBEDTLS and CONFIG_TINYCRYPT) and
+          not CONFIG_PSA_SSF_CRYPTO_CLIENT
+
   tags:
     - mbedtls
     - tinycrypt

diff --git a/tests/net/socket/tls_configurations/overlay-ec.conf b/tests/net/socket/tls_configurations/overlay-ec.conf
@@ -1,5 +1,7 @@
 CONFIG_PSA_WANT_ALG_ECDH=y
 CONFIG_PSA_WANT_ALG_ECDSA=y
-CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC=y
 CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT=y
+CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y
 CONFIG_PSA_WANT_ECC_SECP_R1_256=y
diff --git a/tests/subsys/portability/cmsis_rtos_v2/prj.conf b/tests/subsys/portability/cmsis_rtos_v2/prj.conf
@@ -13,7 +13,6 @@ CONFIG_SCHED_SCALABLE=y
 CONFIG_CMSIS_V2_MEM_SLAB_MAX_DYNAMIC_SIZE=128
 CONFIG_CMSIS_V2_THREAD_MAX_COUNT=23
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_MAX_COUNT=10
-CONFIG_TIMEOUT_64BIT=n
 CONFIG_CMSIS_V2_THREAD_MAX_STACK_SIZE=1024
 CONFIG_CMSIS_V2_THREAD_DYNAMIC_STACK_SIZE=1024
 CONFIG_MP_MAX_NUM_CPUS=1