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.

Sign up for GitHub

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

soc: nordic: Add approtect workaround for 91x1 #79920

Closed
wants to merge 1 commit into from
Closed

soc: nordic: Add approtect workaround for 91x1 #79920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions modules/hal_nordic/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_LOCK
ENABLE_SECURE_APPROTECT)
zephyr_compile_definitions_ifdef(CONFIG_NRF_SECURE_APPROTECT_USER_HANDLING
ENABLE_SECURE_APPROTECT_USER_HANDLING)
zephyr_compile_definitions_ifdef(CONFIG_NRF_CONSTANT_LATENCY_WORKAROUND
ENABLE_CONSTANT_LATENCY_WORKAROUND)
zephyr_library_compile_definitions_ifdef(CONFIG_NRF_TRACE_PORT
ENABLE_TRACE)

Expand Down
19 changes: 19 additions & 0 deletions soc/nordic/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,25 @@ config NRF_SECURE_APPROTECT_USER_HANDLING

endchoice

config NRF_CONSTANT_LATENCY_WORKAROUND
bool "Constant latency mode for debugging purposes"
depends on SOC_NRF9120 && \
!NRF_APPROTECT_LOCK && !NRF_SECURE_APPROTECT_LOCK
default n
help
This option enables a workaround for the nRF9161 anomaly
[36] Debug and Trace: Access port gets locked in WFI and WFE.
It is only for debugging purposes. Do not enable it in production
code.

When this option is selected, the SystemInit() function enables
the constant latency mode by triggering the CONSTLAT task. This
prevents WFI and WFE instructions from entering SYSTEM ON IDLE mode.
As a result, anomaly is avoided with the cost of increased power
consumption.

Note: With multiple images, add this for the first image.

config NRF_TRACE_PORT
bool "nRF TPIU"
depends on !SOC_SERIES_NRF51X
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ manifest:
groups:
- hal
- name: hal_nordic
revision: d5c70305b2389641b0a166d0714775a1b13319a2
revision: pull/231/head
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change should come from an MDK release integrated in a new release of nrfx.

path: modules/hal/nordic
groups:
- hal
Expand Down
Loading