Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

entropy: Add PSA rng as the entropy provider for the nrf54h20 #17200

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4497af3
nrf_security: Make PSA drivers depend on PSA core
Vge0rge Aug 21, 2024
2272407
manifest: Bring Zephyr with PSA RNG for NRF54H20
Vge0rge Sep 5, 2024
3238625
nrf_security: Make PSA SSF client independent
Vge0rge Sep 27, 2024
e9f7f4f
application: matter_bridge: Add overlay for 54h20
Vge0rge Oct 1, 2024
a27d754
samples: suit: flash_compantion: Remove prng
Vge0rge Oct 21, 2024
218bb06
sdfw_services: Remove call to psa_crypto_init from ssf
Vge0rge Nov 5, 2024
6b48d1d
tests: suit: Disable cpusec IPC and bellboard
Vge0rge Nov 5, 2024
dad9e7c
manifest: Fix capitalization
Vge0rge Nov 6, 2024
9de3cc3
sdfw_services: Init ssf_client earlier
Vge0rge Nov 12, 2024
bc7480c
sdfw_services: Use nrf_rpc_init_group in ssf_client init
Vge0rge Nov 20, 2024
a76de0c
test: benchmarks: Disable cpusec nodes for multicore test
Vge0rge Nov 21, 2024
65c0a02
samples: Aligned ram0x overlays in Multicore Tests/Matter samples
ArekBalysNordic Nov 26, 2024
614fa98
manifest: Update nrfxlib
Vge0rge Nov 27, 2024
8165402
samples: suit: smp_transfer: Use PRNG entropy
Vge0rge Dec 4, 2024
a0f8c20
samples: suit: smp_transfer: Change hci_ipc stack defaults
Vge0rge Dec 5, 2024
07aab1f
nrf_rpc: Add nrf_rpc_os_fatal_error
Vge0rge Dec 23, 2024
cfb1ea8
samples: wifi: Disable PSA RNG for all samples
Vge0rge Jan 13, 2025
2ee7988
Revert "sdfw_services: psa_crypto: use new tags for pointer-to-const …
Vge0rge Jan 16, 2025
b013a62
Revert "sdfw_services: regenerate zcbor encoders/decoders with curren…
Vge0rge Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Disable serial and UART interface.
CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
CONFIG_LOG=n

# RAM usage configuration
CONFIG_HEAP_MEM_POOL_SIZE=8192
CONFIG_MAIN_STACK_SIZE=2048
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048

# BT configuration
CONFIG_BT=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=1
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=n
CONFIG_BT_BUF_ACL_RX_SIZE=502
CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
CONFIG_BT_CTLR_PHY_2M=n

# ipc_radio
CONFIG_IPC_RADIO_BT=y
CONFIG_IPC_RADIO_BT_HCI_IPC=y

# NRF_802154_ENCRYPTION is not enabled by default in the `overlay-802154.conf` file
# that is pulled in by NETCORE_IPC_RADIO_IEEE802154 in application's Kconfig.sysbuild.
# For Wi-Fi builds, this option will not get applied anyway.
CONFIG_NRF_802154_ENCRYPTION=y
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

&cpuapp_ram0x_region{
status = "okay";
reg = <0x2f010000 DT_SIZE_K(512)>;
ranges = <0x0 0x2f010000 0x6e000>;
reg = <0x2f011000 DT_SIZE_K(516)>;
ranges = <0x0 0x2f011000 0x6e000>;
cpuapp_data: memory@1000 {
reg = <0x1000 DT_SIZE_K(508)>;
reg = <0x1000 DT_SIZE_K(512)>;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@
status = "disabled";
};

&prng {
status = "disabled";
};


&exmif_default {
group1 {
psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
Expand Down
4 changes: 4 additions & 0 deletions samples/suit/smp_transfer/sysbuild/hci_ipc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
CONFIG_LOG=n
CONFIG_LOG_PRINTK=n
CONFIG_UART_CONSOLE=n

# These are copied from the ipc_radio application, since usage of hci_ipc will be
# replaced by the ipc_radio application later its configuration can be inherited here.
CONFIG_MAIN_STACK_SIZE=2048
18 changes: 18 additions & 0 deletions samples/suit/smp_transfer/sysbuild/recovery_hci_ipc.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,24 @@

#include "nrf54h20dk_nrf54h20_memory_map.dtsi"

/ {
chosen {
zephyr,entropy = &prng;
};

/delete-node/ psa-rng;

prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

};

&cpusec_cpurad_ipc {
status = "disabled";
};

&uart135 {
status = "disabled";
};
Expand Down
28 changes: 28 additions & 0 deletions samples/wifi/monitor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
28 changes: 28 additions & 0 deletions samples/wifi/scan/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
28 changes: 28 additions & 0 deletions samples/wifi/shell/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
28 changes: 28 additions & 0 deletions samples/wifi/shutdown/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
28 changes: 28 additions & 0 deletions samples/wifi/softap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
28 changes: 28 additions & 0 deletions samples/wifi/sta/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* Copyright (c) 2025 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
*/

/ {
prng: prng {
compatible = "nordic,entropy-prng";
status = "okay";
};

chosen {
zephyr,entropy = &prng;
};

psa_rng: psa-rng {
status = "disabled";
};
};


&cpusec_cpuapp_ipc {
status = "disabled";
};

&cpusec_bellboard {
status = "disabled";
};
Loading