soc: nordic: nrf54l15: fix APPROTECT handling #18370

nika-nordic · 2024-10-30T11:14:48Z

Updated sdk-zephyr aligns existing Kconfigs to nRF54L15, while updated TF-M excludes nRF54L15 from existing APPROTECT-related runtime code which is not yet aligned.

test-sdk-nrf: DRGN-23200_host_disconnects_upon_att_timeout

NordicBuilder · 2024-10-30T11:15:29Z

The following west manifest projects have been modified in this Pull Request:

Name	Old Revision	New Revision	Diff
trusted-firmware-m	nrfconnect/[email protected]	nrfconnect/sdk-trusted-firmware-m@`5ae4c7f` (main)	nrfconnect/[email protected]
zephyr	nrfconnect/sdk-zephyr@`a735c24`	nrfconnect/sdk-zephyr@`015b317` (main)	nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2024-10-30T11:19:09Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 11

Inputs:

Sources:

trusted-firmware-m: PR head: 5ae4c7f39ca806d6ea9cc6eb395ea6b886e0d9fd
sdk-nrf: PR head: 5f66f438223b31881441844713cbd1f95c662a90
zephyr: PR head: 015b317bc3242161f731a14a76333ad6c5d7f47d

more details

trusted-firmware-m:

PR head: 5ae4c7f39ca806d6ea9cc6eb395ea6b886e0d9fd
merge base: 8c7fae3936da02b7db4f5c8aba174b252a2b326e
Diff

sdk-nrf:

PR head: 5f66f438223b31881441844713cbd1f95c662a90
merge base: b7a15c32c6c643cf316f5a1c3937f5fdc74b7ee1
target head (main): b7a15c32c6c643cf316f5a1c3937f5fdc74b7ee1
Diff

zephyr:

PR head: 015b317bc3242161f731a14a76333ad6c5d7f47d
merge base: a735c24d172361298102d4dc29fe22397f99f26a
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (84)

lib
│  ├── nrf_modem_lib
│  │  │ nrf_modem_os_rpc.c
modules
│  ├── tee
│  │  ├── tf-m
│  │  │  ├── trusted-firmware-m
│  │  │  │  ├── platform
│  │  │  │  │  ├── ext
│  │  │  │  │  │  ├── target
│  │  │  │  │  │  │  ├── nordic_nrf
│  │  │  │  │  │  │  │  ├── common
│  │  │  │  │  │  │  │  │  ├── core
│  │  │  │  │  │  │  │  │  │  │ target_cfg.c
│  ├── trusted-firmware-m
│  │  ├── tfm_boards
│  │  │  │ external_core.cmake
west.yml
zephyr
│  ├── doc
│  │  ├── connectivity
│  │  │  ├── bluetooth
│  │  │  │  ├── api
│  │  │  │  │  │ connection_mgmt.rst
│  │  │  │  ├── bluetooth-le-host.rst
│  │  │  │  ├── img
│  │  │  │  │  │ att_timeout.svg
│  │  ├── releases
│  │  │  │ release-notes-4.0.rst
│  ├── include
│  │  ├── zephyr
│  │  │  ├── bluetooth
│  │  │  │  ├── bluetooth.h
│  │  │  │  │ conn.h
│  ├── modules
│  │  ├── hal_nordic
│  │  │  ├── nrfx
│  │  │  │  │ CMakeLists.txt
│  ├── soc
│  │  ├── nordic
│  │  │  ├── Kconfig
│  │  │  ├── nrf54l
│  │  │  │  │ soc.c
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  ├── Kconfig
│  │  │  │  ├── adv.c
│  │  │  │  ├── att.c
│  │  │  │  ├── att_internal.h
│  │  │  │  ├── buf.c
│  │  │  │  ├── classic
│  │  │  │  │  ├── l2cap_br.c
│  │  │  │  │  ├── rfcomm.c
│  │  │  │  │  │ ssp.c
│  │  │  │  ├── conn.c
│  │  │  │  ├── conn_internal.h
│  │  │  │  ├── l2cap.c
│  │  │  │  │ smp.c
│  │  │  ├── shell
│  │  │  │  │ bt.c
│  ├── tests
│  │  ├── bluetooth
│  │  │  ├── host
│  │  │  │  ├── conn
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── mocks
│  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  ├── addr_internal.c
│  │  │  │  │  │  ├── addr_internal.h
│  │  │  │  │  │  ├── att_internal.c
│  │  │  │  │  │  ├── att_internal.h
│  │  │  │  │  │  ├── bt_str.c
│  │  │  │  │  │  ├── bt_str.h
│  │  │  │  │  │  ├── buf_view.c
│  │  │  │  │  │  ├── buf_view.h
│  │  │  │  │  │  ├── hci_core.c
│  │  │  │  │  │  ├── hci_core.h
│  │  │  │  │  │  ├── id.c
│  │  │  │  │  │  ├── id.h
│  │  │  │  │  │  ├── kernel.c
│  │  │  │  │  │  ├── kernel.h
│  │  │  │  │  │  ├── l2cap_internal.c
│  │  │  │  │  │  ├── l2cap_internal.h
│  │  │  │  │  │  ├── mock-sections.ld
│  │  │  │  │  │  ├── scan.c
│  │  │  │  │  │  ├── scan.h
│  │  │  │  │  │  ├── smp.c
│  │  │  │  │  │  ├── smp.h
│  │  │  │  │  │  ├── spinlock.c
│  │  │  │  │  │  ├── spinlock.h
│  │  │  │  │  │  ├── sys_clock.c
│  │  │  │  │  │  ├── sys_clock.h
│  │  │  │  │  │  ├── zephyr
│  │  │  │  │  │  │  ├── include
│  │  │  │  │  │  │  │  ├── zephyr
│  │  │  │  │  │  │  │  │  ├── drivers
│  │  │  │  │  │  │  │  │  │  ├── bluetooth
│  │  │  │  │  │  │  │  │  │  │  │ hci_driver.h
│  │  │  │  │  │  │  ├── syscalls
│  │  │  │  │  │  │  │  │ device.h
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ main.c
│  │  │  │  │  │ testcase.yaml
│  │  ├── bsim
│  │  │  ├── bluetooth
│  │  │  │  ├── host
│  │  │  │  │  ├── adv
│  │  │  │  │  │  ├── encrypted
│  │  │  │  │  │  │  ├── ead_sample
│  │  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │  │ ead_sample.sh
│  │  │  │  │  ├── att
│  │  │  │  │  │  ├── compile.sh
│  │  │  │  │  │  ├── eatt
│  │  │  │  │  │  │  ├── tests_scripts
│  │  │  │  │  │  │  │  ├── autoconnect.sh
│  │  │  │  │  │  │  │  ├── collision.sh
│  │  │  │  │  │  │  │  ├── lowres.sh
│  │  │  │  │  │  │  │  ├── multiple_conn.sh
│  │  │  │  │  │  │  │  │ reconfigure.sh
│  │  │  │  │  │  ├── eatt_notif
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ eatt_notif.sh
│  │  │  │  │  │  ├── timeout
│  │  │  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  │  │  ├── compile.sh
│  │  │  │  │  │  │  ├── main.c
│  │  │  │  │  │  │  ├── prj.conf
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ run.sh
│  │  │  │  │  ├── gatt
│  │  │  │  │  │  ├── caching
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ _run_test.sh
│  │  │  │  │  │  ├── ccc_store
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  ├── ccc_store.sh
│  │  │  │  │  │  │  │  │ ccc_store_2.sh
│  │  │  │  │  │  ├── general
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ gatt.sh
│  │  │  │  │  │  ├── notify
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ _run_test.sh
│  │  │  │  │  │  ├── notify_multiple
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ notify.sh
│  │  │  │  │  │  ├── sc_indicate
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ sc_indicate.sh
│  │  │  │  │  ├── security
│  │  │  │  │  │  ├── ccc_update
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  ├── ccc_update.sh
│  │  │  │  │  │  │  │  │ ccc_update_2.sh
│  │  │  │  │  │  ├── security_changed_callback
│  │  │  │  │  │  │  ├── test_scripts
│  │  │  │  │  │  │  │  │ security_changed_callback.sh
│  │  ├── drivers
│  │  │  ├── adc
│  │  │  │  ├── adc_error_cases
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp.overlay
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ adc_error_cases.c
│  │  │  │  │  │ testcase.yaml

Outputs:

Toolchain

Version: b44b7a08c9
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:b44b7a08c9_912848a074

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister - Skipped: Skipping Build & Test as it succeeded in a previous run: 10
✅ Integration tests
- ✅ test-sdk-audio - Skipped: Job was skipped as it succeeded in a previous run
- ✅ desktop52_verification - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test_ble_nrf_config - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-ble_samples - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-chip - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nfc - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_cloud - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_samples - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_lwm2m - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_thingy91 - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf_crypto - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-rs - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-fem - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-tfm - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-thread - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-find-my - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-fw-nrfconnect-nrf-iot_mosh - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-sidewalk - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-low-level - Skipped: Job was skipped as it succeeded in a previous run
- ✅ test-sdk-dfu - Skipped: Job was skipped as it succeeded in a previous run

Disabled integration tests

- doc-internal
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-boot
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_nrf_provisioning
- test-fw-nrfconnect-nrf-iot_positioning
- test-fw-nrfconnect-proprietary_esb
- test-fw-nrfconnect-ps
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-zigbee
- test-sdk-mcuboot
- test-sdk-pmic-samples
- test-sdk-wifi
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

NordicBuilder · 2024-10-30T11:30:37Z

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

nika-nordic · 2024-10-31T09:55:48Z

@rlubos Is it possible to run TF-M integration tests that were previously failing only after merge?

rlubos · 2024-10-31T10:55:46Z

@rlubos Is it possible to run TF-M integration tests that were previously failing only after merge?

I'm not sure, @PerMac does ci-all-tests affect twister?

PerMac · 2024-10-31T11:26:33Z

I am checking this now

PerMac · 2024-10-31T11:35:19Z

yes, setting ci-all-test label will force full twister scope (without dynamic scoping). However, it will also turn on all downstream jobs. There is no label to ask just full twister without affecting downstreams

PerMac · 2024-10-31T11:47:38Z

@nika-nordic do you remember which exact tests these were? Maybe they are already in scope?

PerMac · 2024-10-31T13:02:59Z

I believe these are those and are already in scope, passing the build
https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-18370/4/testReport/nrf54l15dk_nrf54l15_cpuapp_ns_tfm/regression_ipc_lvl1/
https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-18370/4/testReport/nrf54l15dk_nrf54l15_cpuapp_ns_tfm.regression_ipc_lvl2/
https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-18370/4/testReport/nrf54l15dk_nrf54l15_cpuapp_ns_tfm/regression_sfn_lvl1/
https://jenkins-ncs.nordicsemi.no/job/latest/job/sdk-nrf/job/PR-18370/4/testReport/nrf54l15dk_nrf54l15_cpuapp_ns_tfm/regression_fp_hardabi/

nika-nordic · 2024-10-31T13:03:44Z

I have discussed scope of TF-M tests offline with @PerMac and they are fixed.

Therefore sdk-zephyr and TF-M PRs are ready to be merged.

rlubos · 2024-10-31T13:53:47Z

@nika-nordic Please update SHA and backport this

rlubos · 2024-10-31T13:55:11Z

Note this cannot be backported automatically, SHAs will not match

Allow nRF54L15 approtect settings to be set through TF-M. Signed-off-by: Markus Lassila <[email protected]>

Updated sdk-zephyr aligns existing Kconfigs to nRF54L15, while updated TF-M excludes nRF54L15 from existing APPROTECT-related runtime code which is not yet aligned. Signed-off-by: Nikodem Kastelik <[email protected]>

The recently added assert statement was missing comma. Signed-off-by: Robert Lubos <[email protected]>

nika-nordic requested a review from MarkusLassila October 30, 2024 11:14

nika-nordic requested review from a team as code owners October 30, 2024 11:14

nika-nordic added the backport v2.8-branch auto-create a PR with same commits to v2.8-branch label Oct 30, 2024

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 30, 2024

NordicBuilder added manifest-trusted-firmware-m manifest-zephyr DNM labels Oct 30, 2024

This was referenced Oct 30, 2024

tfm: Propagate nRF54L15 approtect settings #18365

Closed

manifest: sdk-zephyr: [nrf fromlist] soc: nordic: nrf54l15: fix APPROTECT handling #18369

Closed

nordicjm approved these changes Oct 30, 2024

View reviewed changes

nika-nordic mentioned this pull request Oct 30, 2024

[nrf noup] platform: nordic_nrf: nRF54L15 does not have UICR nrfconnect/sdk-trusted-firmware-m#173

Merged

MarkusLassila approved these changes Oct 30, 2024

View reviewed changes

nika-nordic force-pushed the fix_nrf54l_kconfig_approtect_sdknrf branch from cea3c55 to f3a7106 Compare October 31, 2024 05:45

This was referenced Oct 31, 2024

manifest: sdk-zephyr: [nrf fromlist] soc: nordic: nrf54l: fix configuration of DCDC regulator #18397

Closed

manifest: sdk-zephyr: Bluetooth: Host: Downstream 21.10.2024 #18276

Closed

rlubos removed the backport v2.8-branch auto-create a PR with same commits to v2.8-branch label Oct 31, 2024

rlubos force-pushed the fix_nrf54l_kconfig_approtect_sdknrf branch from f3a7106 to 1b6a7fd Compare October 31, 2024 15:08

NordicBuilder removed the DNM label Oct 31, 2024

MarkusLassila and others added 2 commits October 31, 2024 21:06

tfm: Propagate nRF54L15 approtect settings

0440878

Allow nRF54L15 approtect settings to be set through TF-M. Signed-off-by: Markus Lassila <[email protected]>

manifest: update sdk-zephyr and tf-m to have APPROTECT for nRF54L15

7c1635f

Updated sdk-zephyr aligns existing Kconfigs to nRF54L15, while updated TF-M excludes nRF54L15 from existing APPROTECT-related runtime code which is not yet aligned. Signed-off-by: Nikodem Kastelik <[email protected]>

rlubos force-pushed the fix_nrf54l_kconfig_approtect_sdknrf branch from 1b6a7fd to 7c1635f Compare October 31, 2024 20:06

lib: nrf_modem_lib: Add missing comma in assert

5f66f43

The recently added assert statement was missing comma. Signed-off-by: Robert Lubos <[email protected]>

rlubos requested review from a team as code owners October 31, 2024 21:07

rlubos merged commit 4acd63a into main Oct 31, 2024
13 checks passed

nika-nordic mentioned this pull request Nov 4, 2024

[Backport v3.7.99-ncs1-branch] [nrf fromlist] soc: nordic: nrf54l15: fix APPROTECT handling #18478

Merged

rlubos deleted the fix_nrf54l_kconfig_approtect_sdknrf branch November 5, 2024 15:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

soc: nordic: nrf54l15: fix APPROTECT handling #18370

soc: nordic: nrf54l15: fix APPROTECT handling #18370

nika-nordic commented Oct 30, 2024 •

edited by rlubos

Loading

NordicBuilder commented Oct 30, 2024 •

edited

Loading

NordicBuilder commented Oct 30, 2024 •

edited

Loading

NordicBuilder commented Oct 30, 2024

nika-nordic commented Oct 31, 2024

rlubos commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

nika-nordic commented Oct 31, 2024

rlubos commented Oct 31, 2024

rlubos commented Oct 31, 2024

soc: nordic: nrf54l15: fix APPROTECT handling #18370

soc: nordic: nrf54l15: fix APPROTECT handling #18370

Conversation

nika-nordic commented Oct 30, 2024 • edited by rlubos Loading

NordicBuilder commented Oct 30, 2024 • edited Loading

NordicBuilder commented Oct 30, 2024 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

NordicBuilder commented Oct 30, 2024

nika-nordic commented Oct 31, 2024

rlubos commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

PerMac commented Oct 31, 2024

nika-nordic commented Oct 31, 2024

rlubos commented Oct 31, 2024

rlubos commented Oct 31, 2024

nika-nordic commented Oct 30, 2024 •

edited by rlubos

Loading

NordicBuilder commented Oct 30, 2024 •

edited

Loading

NordicBuilder commented Oct 30, 2024 •

edited

Loading