Cherry pick nRFX SPIS PM #2583
Closed
Cherry pick nRFX SPIS PM #2583
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… updates -Update hostap to PR nrfconnect#76 which adds support for CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG instead of relying on legacy Mbed TLS ctr_drbg and entropy APIs. This change is in line with PSA crypto entropy changes in Zephyr happening with TinyCrypt deprecation and advancement of PSA crypto mechanisms -Remove defconfigs for currently sets the Kconfigs: -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_ALLOW_NON_CSPRNG Upstream PR #: 84517 Signed-off-by: Frank Audun Kvamtrø <[email protected]>
…endencies -PSA_WANT_ALG_CMAC must be set for PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 to be valid. This commit fixes this mismatch for hostap Upstream PR #: 84517 Signed-off-by: Frank Audun Kvamtrø <[email protected]>
…nfigurations
-Mbed TLS has come up with its own naming-convention with regards
to certain Mbed TLS configurations for TLS/DTLS and X.509. This
commit fixes a couple of them by depending on MBEDTLS_BUILTIN
which is set when Kconfig.tls-generic is used
1. Make MBEDTLS_PEM_CERTIFICATE_FORMAT depend on MBEDTLS_BUILTIN
The proper name for this functionaity is MBEDTL_PEM_PARSE_C and
MBEDTLS_PEM_WRITE_C
2. Make MBEDTLS_SERVER_NAME_INDICATION depend on MBEDTLS_BUILTIN
The proper name for this is MBEDTLS_SSL_SERVER_NAME_INDICATION
Upstream PR #: 84517
Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Problem ------- Board & SoC extensions are used to define out-of-tree board variants or SoC qualifiers. When a board is extended, it has multiple directories associated with it (each with its own `board.yml`), where twister should be able to find additional platform files to support these qualifiers. Currently, this doesn't work, because twister only traverses the primary BOARD_DIR and ignores the rest. The fix would've been trivial in the case of "legacy" platform files, i.e. those of the form `<normalized_board_target>.yaml`, but it's less straightforward for the newly introduced `twister.yaml` format. A `twister.yaml` file contains platform configuration that can be shared by multiple board targets and tweaked for specific targets by using the top-level `variants` key. Normally, there is at most one `twister.yaml` per board, but the file isn't necessarily unique to one board. Instead, it's unique to one directory, which may define multiple boards (as is the case with e.g. `boards/qemu/x86/`). With extensions in the picture, the goal is to initialize platforms when given multiple `twister.yaml` per board. The OOT files are expected to only provide information about OOT board targets, without being able to override in-tree targets (same principle as in the Zephyr build system). Solution -------- Scanning for `twister.yaml` is broken up into multiple passes - first loading all the files, then splitting the `variants` keys apart from the shared configuration, before constructing the Platform instances. The purpose of the split is to treat the variant information as global, instead of making unnecessary or faulty assumptions about locality. Remember that the build system can derive board target names not only from `board.yml`, but from `soc.yml` too. Considering that any board may end up using an OOT-extended SoC (and hence multiple `soc.yml` files), not every board target can be said to belong to some board dir. Unlike the variant data, the remaining top-level config is still rooted to the primary BOARD_DIR and inherited by the extension dirs from there. This is quite intuitive in most imagined cases, but there is a caveat: if a `twister.yaml` resides in an extension dir, then it is allowed to have a top-level config of its own, but it will be silently ignored. This is to support corner cases where, much like how a single board dir can define multiple boards, a single board dir can also extend multiple boards, or even do both. In those cases, the primary BOARD_DIR rule should make it unambiguous which config belongs to which board, even if it may seem counter-intuitive at first. Upstream PR #: 84975 Signed-off-by: Grzegorz Swiderski <[email protected]>
This reverts commit 70419bd. This is because there are issues around slow IPC thoughput with icbmsg, which is causing issues with BLE when lots of data is required to be exchanged, e.g. with ISO. Also there is an assert icmsg.c#L190 which occurs when initializing bluetooth and IPC in certain circumstances. Upstream PR #: 85621 Signed-off-by: Sean Madigan <[email protected]>
Non-secure variants for nRF7002 DK were removed from upstream in commit 10d4973. Revert these changes downstream, so that the NS variants are still available. Signed-off-by: Andrzej Głąbek <[email protected]>
…en built-in in PSA" This reverts commit ac6d834. Temporarily revert an upstream change that leads to a Kconfig dependency loop with MBEDTLS_CIPHER_AES_ENABLED. This is supposed to be replaced with a better fix later. Signed-off-by: Andrzej Głąbek <[email protected]>
This test cannot be executed with the SDFW Service Framework client started, so disable its initialization. Signed-off-by: Andrzej Głąbek <[email protected]>
The BT_DRIVERS symbol default value 'y' used to depend on !BT_CTLR but now it is always on when BT is set. For BT_RPC the BT_DRIVERS symbol must not be enabled on the client side as no driver is used. The temporary solution is to set BT_DRIVERS to 'y' by default only when BT_HCI stack selection is enabled. It will be 'n' when BT_RPC_STACK is enabled. The fix should be fine as NCS uses either HCI or RPC stack. Signed-off-by: Michał Grochala <[email protected]>
noup because it's about partition manager. Fix the build of secure_storage.psa.its.secure_storage.store.zms on nrf54l15dk/nrf54l15/cpuapp by disabling partition manager, which is incompatible with the ZMS implementation of the ITS store module. Disabling it only for that test as it's not needed for the others and even makes the NS board targets fail if disabling PM. Signed-off-by: Tomi Fontanilles <[email protected]>
-Adding imply MBEDTLS_CIPHER_AES_ENABLED if not TF-M build in BT_CRYPTO -Needed to set a specific symbol for MBEDTLS + MBEDTLS_BUILTIN to work on network core build. -This [nrf noup] can be removed once PSA crypto is fully supported in network core, or PSA crypto is not compiled in at all and is provided as a RPC-mechanism via the app-core Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Set CONFIG_TFM_PROFILE_TYPE_MEDIUM for boards with TF-M to enable ITS and PS. Enable CONFIG_PSA_WANT_GENERATE_RANDOM to fix persistent_key tests when TF-M is used. native_sim target needs CONFIG_PSA_WANT_ALG_ECB_NO_PADDING. Skip checking of private_reserved field in psa_key_attributes if present. Increase maximum ITS asset size. Signed-off-by: Juha Ylinen <[email protected]>
Set CONFIG_TFM_PROFILE_TYPE_MEDIUM for boards with TF-M to enable ITS and PS. Enable CONFIG_PSA_WANT_GENERATE_RANDOM to fix persistent_key sample. native_sim requires ECB cipher to be enabled. Signed-off-by: Juha Ylinen <[email protected]>
This reverts commit 8758068. Signed-off-by: Karsten Koenig <[email protected]>
Recent versions fixed issues for EXMIF and TDM pins as well as support for dynamic placement of the ETR buffer. Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 5f6a3eb)
Upstream not ready yet, revert once applied there. Signed-off-by: Gerard Marull-Paretas <[email protected]> Signed-off-by: Karsten Koenig <[email protected]> (cherry picked from commit 6384b58)
nrf noup resolution - Please drop this commit after upmerge if there is a conflict, as it should no longer be required. This warning is raised in many places when using bluetooth. However, it is not very useful for the user to see. This is a noup PR as there is currently more changes coming in around this code and how to handle deadlocks in zephyr. Signed-off-by: Sean Madigan <[email protected]>
With code relocation directives passed to the gen_relocate_app.py script using generated file, then each directive can be place on individual line in the file and thus free up the `|` character as separator. Furthermore, a multi-line file with each directive on separate line is also more user-readable, making debugging easier. Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit cb8f99a)
One might want to select the symbols to be relocated inside a file or a library. To do this, one can use the FILTER argument of zephyr_code_relocate which must contain a regular expression of the section names to be selected for relocation. The test_function_in_sram2 test case in `tests/application_development/code_relocation` has been updated to verify that only one function `function_in_sram()` is relocated to ram and that the function `function_not_relocated()` is not being relocated when using relocation filter. Signed-off-by: Sylvain Chouleur <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 4454734)
…tem workq Change allows performing ECDH operations through system workq. This is done to allow reducing memory consumption by disabling the long workq on small SoCs. Signed-off-by: Marek Pieta <[email protected]> (cherry picked from commit c7f3ad6)
Enabled tests: - clock_control_api - nrf_clock_calibration - nrf_lf_clock_start - clock_control/onoff - counter_basic_api - flash/common - flahs/negative_tests - retained_mem/api - nrf_grtc_timer - wdt_error_cases - fs/fcb - stream/stream_flash Signed-off-by: Rafał Kuźnia <[email protected]> Signed-off-by: Sebastian Głąb <[email protected]> (cherry picked from commit 6f419cd)
…F5340dk Enable wdt_error_cases test on nRF5340dk. Define valid test configuration for that target (reuse from nRF54H/nRF54L). Add target to the platform_allow. Signed-off-by: Sebastian Głąb <[email protected]> (cherry picked from commit c4a8179)
…racteristics Added new Kconfig option set that allows the user to control the presence of the following optional characteristics: - Manufacturer Name String - Model Number String Depreacted the old configuration that can be deleted in the future Zephyr releases. Signed-off-by: Kamil Piszczek <[email protected]> (cherry picked from commit 7c828bd)
…gets Test was using interrupt lines which does not exist on nRF VPR targets. nRF54Lx FLPR has interrupts >= 16 and nRF54Hx PPR does not have interrupt 17. Added configuration which works for nrf54h20_cpuppr and nrf54lx_flpr. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 0359f37)
…FLPR target Fix kernel `gen_isr_table` test for nRF FLPR target similairly to PPR target. Signed-off-by: Adam Kondraciuk <[email protected]> (cherry picked from commit 85282d6)
Added support for nRF54H20 cpuppr PWM in blinky_pwm and fade_led sample. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 5b34d77)
Added support for nRF54H20 cpuppr PWM in pwm_api test. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit cec083e)
…YNTH When using synthesized low frequency clock, HFXO should be running to ensure correct frequency. Signed-off-by: Michał Stasiak <[email protected]> (cherry picked from commit 9a47667)
…pported peripherals Enable Twister tests of PWM driver on nrf54l20pdk. Overlays were already added to PWM tests. Signed-off-by: Sebastian Głąb <[email protected]> (cherry picked from commit ecd53f9)
Define PWM LED at nRF54L20pdk board definition. Set status=okay for pwm20 node. Add pincontrol for pwm20:OUT0 at P1.07 (LED1). Add pwm_led1 node. Add alias pwm-led0. Signed-off-by: Sebastian Głąb <[email protected]> (cherry picked from commit 23e6854)
…tem workqueue The buffer allocation in conn.c will trigger warnings if we try to use anything else than K_NO_WAIT for the timeout when called from within the system workqueue. The calls in l2cap.c and att.c which may pass non-zero timeouts already have proper handling for failed allocations, so make sure we use K_NO_WAIT to avoid unnecessary warnings from conn.c. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Aleksandr Mirlenko <[email protected]> (cherry picked from commit 05b16b9)
When a LD sends an ic-msg to SCFW - it happens that sometimes that SCFW does not handle the request. For the moment the problem is solved by sending a second vevif event shortly after the initial request. Upstream PR #: 86455 Signed-off-by: Maciej Meijer <[email protected]>
…54 devices Extend spi_loopback test on nRF54 chip family. Add configurations to run this test at 8/16/32 MHz. Upstream PR #: 86010 Signed-off-by: Sebastian Głąb <[email protected]>
Increase value of `CONFIG_BTTESTER_BTP_CMD_THREAD_STACK_SIZE` for nrf54L15 board to avoid stack overflow. Remove the config in the Mesh overlay as it's was also added for nrf54L15. Signed-off-by: Théo Battrel <[email protected]> (cherry picked from commit 75885e8)
…rt anomaly Add workaround to HFCLK start and stop in nrf54l. In future workaround will be in nrfx driver. Signed-off-by: Krzysztof Chruściński <[email protected]> (cherry picked from commit 2cb2cf2)
…Cracen driver on nRF54H20 A larger stack is needed to accomodate the Cracen driver. Signed-off-by: Gordon Klaus <[email protected]>
nrf-squash! [nrf noup] include: net: add NCS extensions Removes leftover socket options `TLS_SESSION_CACHE_DISABLED` and `TLS_SESSION_CACHE_ENABLED`. These exist already in `socket.h`. Signed-off-by: Mirko Covizzi <[email protected]>
nrf-squash! [nrf noup] include: net: add NCS extensions Adds a base value for NCS specific socket options to prevent overlaps with Zephyr's socket options. Signed-off-by: Mirko Covizzi <[email protected]>
Change number of IRQ parameter for nRF54L09 devices. Upstream PR #: 86350 Signed-off-by: Adam Kondraciuk <[email protected]>
…ting When left-shifting '1' by 31, the result is undefined. This is something ASAN detects. Solve this by explicitly defining that the integer is unsigned. Upstream PR #: 86624 Signed-off-by: Rubin Gerritsen <[email protected]>
Added support for nRF54L20 FLPR core in devicetree. Upstream PR #: 79355 Signed-off-by: Michał Stasiak <[email protected]>
Added support for nRF54L20 FLPR core in soc dir. Upstream PR #: 79355 Signed-off-by: Michał Stasiak <[email protected]>
Added configuration files for nRF54L20 FLPR core. Upstream PR #: 79355 Signed-off-by: Michał Stasiak <[email protected]>
Added support for FLPR core in nRF54L20pdk board. Upstream PR #: 79355 Signed-off-by: Michał Stasiak <[email protected]>
Add snippet to boot nRF54L20pdk FLPR from application core. Upstream PR #: 79355 Signed-off-by: Michał Stasiak <[email protected]>
Quad Enable bit is used to enable/disable 4x line IO in SPI. Upstream PR #: 85520 Signed-off-by: Marcin Szymczyk <[email protected]>
…_QUAD_1_4_4 Extend driver to support single lane and 1-4-4 IO modes. Upstream PR #: 85520 Signed-off-by: Marcin Szymczyk <[email protected]>
Added clocks to GRTC node to allow GRTC output and access to frequency property. Upstream PR #: 86701 Signed-off-by: Michał Stasiak <[email protected]>
gmarull
reviewed
Mar 6, 2025
drivers/spi/spi_nrfx_spis.c
Outdated
Comment on lines
180
to
182
| #if defined(CONFIG_PM_DEVICE_RUNTIME) | ||
| pm_device_runtime_get(dev); | ||
| #endif |
Member
There was a problem hiding this comment.
these calls have stubs when not enabled, so ifdeffery can go
Implement PM device runtime in nrx spis device driver. Upstream PR #: 86709 Signed-off-by: Bjarki Arge Andreasen <[email protected]>
…-spis The nrf-spis instances require zephyr,pm-device-runtime-auto; to be properly initialized. Upstream PR #: 86709 Signed-off-by: Bjarki Arge Andreasen <[email protected]>
bjarki-andreasen
force-pushed
the
cherry-pick-nrfx-spis-pm
branch
from
5423c21 to
d6afd6f
Compare
Contributor
Author
|
ping @gmarull |
nordic-segl
approved these changes
Apr 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry pick nRFX SPIS PM