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

Basic handling of TAMPC #163

Draft
wants to merge 69 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
a3a03e5
[nrf noup] crypto: Have CRYPTO_HW_ACCELERATOR support nrf_security
SebastianBoe Mar 1, 2024
83c37f8
[nrf noup] crypto: replace usage of mbedtls_hkdf
SebastianBoe Mar 1, 2024
20380fb
[nrf noup] platform: nrf_nordic: Add temp fix for for secure FPU on 9161
SebastianBoe Mar 1, 2024
9244daf
[nrf fromlist] secure_fw: Add option to log output on a shared UART i…
SebastianBoe Mar 1, 2024
8e0ebb2
[nrf toup] platform: nordic_nrf: Add support shared UART and using UA…
SebastianBoe Mar 1, 2024
aa3bbe6
[nrf fromtree] config: Disable cipher crypto module in small and medi…
SebastianBoe Mar 1, 2024
24efcc1
[nrf fromtree] partitions: crypto: Add missing PSA defined algorithms…
SebastianBoe Mar 1, 2024
2c79e2a
[nrf fromtree] platform: exception_info: Add getter for exception inf…
SebastianBoe Mar 1, 2024
76363c0
[nrf fromtree] platform: Change exception handler to use system regis…
SebastianBoe Mar 1, 2024
c183887
[nrf fromtree] platform: Store callee saved register in exception inf…
SebastianBoe Mar 1, 2024
744ee55
[nrf fromtree] platform: nordic_nrf: Store SPU fault information
SebastianBoe Mar 1, 2024
868fa29
[nrf fromtree] platform: nordic_nrf: unify target configuration header
SebastianBoe Mar 1, 2024
9f6cd6e
[nrf fromtree] platform: nordic_nrf: Refactor peripheral SPU configur…
SebastianBoe Mar 1, 2024
7aed5d8
[nrf fromlist] Build: crypto: Do not compile p256 if not enabled
SebastianBoe Mar 1, 2024
9d18510
[nrf fromlist] platform: nordic_nrf: Move startup CMake code into common
SebastianBoe Mar 1, 2024
4e93810
[nrf noup] Do not pass PSA_CONFIG again to crypto library
SebastianBoe Mar 1, 2024
ed1bc89
[nrf fromlist] platform: nordic_nrf: Document FlashInfo fields
SebastianBoe Mar 1, 2024
660bd6d
[nrf fromlist] platform: nordic_nrf: Remove unused driver functions
SebastianBoe Mar 1, 2024
bfde4d7
[nrf fromlist] platform: nordic_nrf: Remove Flash_Uninitialize function
SebastianBoe Mar 1, 2024
f1aa714
[nrf toup] secure_fw: spm: Add stdio_uinit
SebastianBoe Mar 1, 2024
db18f3f
[nrf toup] platform: nordic_nrf: Fix USART driver
SebastianBoe Mar 1, 2024
293f6cf
[nrf noup] Remove check for P256M
SebastianBoe Mar 1, 2024
4eff835
[nrf noup] platform: nordic_nrf: Add support for 54l
SebastianBoe Mar 1, 2024
2a2e1ce
[nrf noup] cmake: tools: Dont add a custom command for running the ma…
SebastianBoe Mar 7, 2024
d824e94
[nrf noup] crypto: Add PAKE support
mswarowsky Feb 29, 2024
a22fef3
[nrf noup] Add missing SPU funcs in target_cfg.c
Vge0rge Mar 8, 2024
5454e8e
Revert "[nrf noup] Add missing SPU funcs in target_cfg.c"
anangl Mar 25, 2024
0cf4946
[nrf fromtree] Crypto: Add missing key derivation APIs in the interface
Summer-ARM Nov 29, 2023
42494c1
[nrf fromtree] TFMV-7: SPM: Fix ARoT to PRot data access vulnerability.
Anton-TF Apr 3, 2024
8959d4c
[nrf fromlist] ps: Fix the support for disabling PS_ENCRYPTION
SebastianBoe Mar 18, 2024
68e552f
[nrf fromlist] platform: nordic_nrf: Add MDK defines required by tfm_ns
SebastianBoe Mar 18, 2024
308344f
[nrf fromlist] platform: nordic_nrf: add support for more UARTs
SebastianBoe Mar 15, 2024
17c198f
[nrf fromlist] platform: nordic_nrf: Support RRAMC
SebastianBoe Mar 18, 2024
813aa16
[nrf noup] platform: nordic_nrf: Add support for 54l
SebastianBoe Mar 14, 2024
2128757
[nrf noup] platform: nordic_nrf: Add support for 54l
SebastianBoe Mar 20, 2024
1a17888
[nrf noup] platform: nordic_nrf: include autoconf.h from target_cfg.c
SebastianBoe Mar 19, 2024
f3cc572
[nrf noup] platform: nordic_nrf: Add support for 54l
SebastianBoe Mar 21, 2024
9c8fa41
[nrf toup] platform: nordic_nrf: Add support shared UART and using UA…
SebastianBoe Apr 10, 2024
9145452
[nrf noup] Support CMAC KDF and custom builtin solution
vili-nordic Apr 15, 2024
f62fbdd
[noup] platform: nordic_nrf: Add LFXO support for 54L
mswarowsky Apr 23, 2024
be60427
[nrf noup] platform: nordic_nrf: Add debug port support
mswarowsky Apr 23, 2024
017ecdf
[nrf noup] platform: nordic_nrf: configure the NRF_RRAMC_S peripheral
SebastianBoe Apr 11, 2024
a829788
[nrf noup] tfm: Detect wrong headers being included
SebastianBoe Apr 10, 2024
7b734fe
[noup] platform: nordic_nrf: Configure XL1/2 pin based on Kconfig
mswarowsky Apr 24, 2024
ddd5acf
[nrf noup] Fix support CMAC KDF and custom builtin solution
mswarowsky Apr 30, 2024
79ad65e
[nrf noup] platform: nordic_nrf: Enable PS encryption again
mswarowsky Apr 30, 2024
87059eb
[nrf noup] platform: nordic_nrf: 54L Add ITS encryption support
mswarowsky May 2, 2024
fb1c0db
[nrf noup] platform: nordic_nrf: config of UART instances
mswarowsky May 8, 2024
6e6d572
[nrf noup] tfm: 54l: Improve MPC configuration documentation
SebastianBoe May 3, 2024
016b1dd
[nrf noup] tfm: 54l: Lock unused MPC OVERRIDES
SebastianBoe May 14, 2024
dd01147
[nrf noup] Add MPC and SPC error reporting for nrf54l
vili-nordic Apr 19, 2024
2ade42f
[nrf fromtree] Platform: Nordic: refactor spu_peripheral_config to us…
SebastianBoe May 14, 2024
a1bbc60
[nrf noup] nordic_nrf: refactor spu_peripheral_config to use base add…
SebastianBoe May 14, 2024
232f8b5
[nrf fromlist] Platform: Nordic: Add function for calculating spu ins…
SebastianBoe May 14, 2024
a35b6a4
[nrf fromlist] Platform: Nordic: Port spu_peripheral_config
SebastianBoe May 16, 2024
4e3cdd2
[nrf noup] nrf54l: configure pins as secure
SebastianBoe May 14, 2024
57aa07d
[nrf noup] Platform: 54l: Delete dead code in target_cfg.c
SebastianBoe May 16, 2024
406ebd5
[nrf noup] Platform: 54L: Refactor UART security configuration
SebastianBoe May 16, 2024
67783a6
[nrf noup] Platform: Nordic: Configure misc. peripherals as Secure
SebastianBoe May 16, 2024
3ebf3d3
[nrf noup] platform: nordic_nrf: 54L Use HUK library for EITS
mswarowsky May 21, 2024
39a386c
[nrf fromtree] Platform: nordic_nrf: Don't configure NRF_VMC as non-s…
nordic-mare May 23, 2024
92a5b4f
[nrf noup] cmake: Fix TFM psa_crypto_config linking error
rlubos May 21, 2024
0fa3c2a
[nrf noup] platform: nordic_nrf: Fix 54L Add ITS encryption support
mswarowsky Jun 4, 2024
553c47a
[nrf noup] Fix version warning
vili-nordic Jun 21, 2024
9ef8c37
[nrf noup] tfm: 54l: configure NRF_REGULATORS as secure
SebastianBoe May 21, 2024
f334e66
[nrf noup] tfm: 54l: Remove TODO that has been addressed
SebastianBoe May 24, 2024
e7ecf59
[nrf fromtree] platform: nordic: Add platform memory write service
Vge0rge May 28, 2024
bc01a4c
[nrf noup] platform: ext: nordic_nrf: Custom nRF54L15 linker file
Vge0rge Jun 25, 2024
965545c
Basic handling of TAMPC
vili-nordic Jul 9, 2024
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
Prev Previous commit
Next Next commit
[nrf noup] platform: nordic_nrf: Add debug port support
fixup! [nrf noup] platform: nordic_nrf: Add support for 54l

The Product spec says:
 To enable port protection access for both secure and non-secure modes,
 use the registers UICR.SECUREAPPROTECT and UICR.APPROTECT.

 Which is the same behavior than on the 91 platforms so TF-M doesn't
 need to do anything.

 Ref: NCSDK-25047

Signed-off-by: Markus Swarowsky <markus.swarowsky@nordicsemi.no>
  • Loading branch information
mswarowsky committed Apr 23, 2024

Verified

This commit was signed with the committer’s verified signature.
mrgrain Momo Kornher
commit be6042780b8f8e86ed9333e07d38b3c7f0160802
5 changes: 1 addition & 4 deletions platform/ext/target/nordic_nrf/common/core/target_cfg.c
Original file line number Diff line number Diff line change
@@ -630,7 +630,7 @@ enum tfm_plat_err_t system_reset_cfg(void)

enum tfm_plat_err_t init_debug(void)
{
#if defined(NRF91_SERIES)
#if defined(NRF91_SERIES) || defined(NRF54L15_ENGA_XXAA)

#if !defined(DAUTH_CHIP_DEFAULT)
#error "Debug access on this platform can only be configured by programming the corresponding registers in UICR."
@@ -661,10 +661,7 @@ enum tfm_plat_err_t init_debug(void)
NRF_CTRLAP->SECUREAPPROTECT.LOCK = CTRLAPPERI_SECUREAPPROTECT_LOCK_LOCK_Locked <<
CTRLAPPERI_SECUREAPPROTECT_LOCK_LOCK_Msk;

#elif defined(NRF54L15_ENGA_XXAA)
// TODO: NCSDK-25047: Support nRF54L
#else

#error "Unrecognized platform"

#endif