Skip to content

Conversation

@frkv
Copy link
Contributor

@frkv frkv commented Dec 13, 2024

CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC is promptless so it cannot be selected. Moreover it's also automatically enabled by CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE in the same overlay file so there would be no need to explicitly enable it.

As for the IMPORT, EXPORT, DERIVE they are needed for the TLS connection to work properly. Previously it was working because at least IMPORT and EXPORT are internally enabled by Mbed TLS at build time. So here we are basically doing the same enablements with Kconfigs in clear.

de-nordic and others added 30 commits December 5, 2024 12:16
The option notifies application that MCUboot has been configured
to use SHA512 for image hashing.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit dcb8c6a)
Adds support for images signed with SHA512.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 61555a3)
Increase stack size as support for SHA512 requires more data.

Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit c5efe1f)
Add pins retention control when GPD is enabled for SPIM.

Upstream PR #: 81134

Signed-off-by: Adam Kondraciuk <[email protected]>
(cherry picked from commit 87e5b3f)
Add pin retenion if GPD is enabled for nRF54H20.

Upstream PR #: 80672

Signed-off-by: Michał Stasiak <[email protected]>
(cherry picked from commit b524b0e)
FAST_ACTIVE1 domain needs to be kept ON while the peripheral is
active (always in this driver).

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit b9bc084)
Fix and update triggers for SUIT DFU tests.

Signed-off-by: Krzysztof Szromek <[email protected]>
(cherry picked from commit df2fd0e)
… of s2ram_suspend

The return value of the system_off call is overwritten by the the call to
pm_s2ram_mark_check_and_clear. As arch_pm_s2ram_suspend needs to specify
why system_off failed, we need to make sure the rv of system_off is moved
to a safe register before calling pm_s2ram_mark_check_and_clear and moved
to r0 als rv of arch_pm_s2ram_suspend when the suspend call exits.

Upstream PR #: 80642

Signed-off-by: Hessel van der Molen <[email protected]>
(cherry picked from commit a93ae9d)
To properly execute erase, recover and reset.

Upstream PR #: 81420

Signed-off-by: Piotr Kosycarz <[email protected]>
(cherry picked from commit d0fbc49)
Uses a temporary file for dts output then uses CMake to copy to the
correct file if it has changed. This prevents a ping-pong issue when
sysbuild is used of configuring and building cycle when nothing has
changed and there is sysbuild code which loads in the devicetree
data from an image

Upstream PR #: 81340

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit aa40507)
Add unit tests for bt_le_cs_step_data_parse.
Also exit early (without calling the function pointer) if the next
step would seem to read out of bounds.

Signed-off-by: Olivier Lesage <[email protected]>
(cherry picked from commit 635d03b)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 343700b)
The 12-bit signed values for the results of PBR are a bit
cumbersome, so this adds a helper function to make it easier to work
with the HCI formatted steps.

Signed-off-by: Olivier Lesage <[email protected]>
(cherry picked from commit 7e72d46)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit e168bcf)
Update FAE table type from array of uint8_t to int8_t. From Vol 6.0,
Part B, section 2.4.2.52: "The ChFAE field contains the per-channel
mode-0 FAE table of the local Controller. Every per-channel mode-0
FAE value is represented by an 8-bit signed integer"

Signed-off-by: Adam Cavender <[email protected]>
(cherry picked from commit a68a0a4)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit ad4c704)
Fix a spelling mistake in the enum bt_le_cs_procedure_phy, and various
mistakes in comments.

Signed-off-by: Timothy Keys <[email protected]>
(cherry picked from commit 59126ac)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 9bfb654)
This code is redundant and causes a build error if called more than
once.

Signed-off-by: Timothy Keys <[email protected]>
(cherry picked from commit 97399d4)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 26d1cc3)
…p_bits

Add coverage of the bt_le_cs_set_valid_chmap_bits function to unit tests

Signed-off-by: Timothy Keys <[email protected]>
(cherry picked from commit e976a01)

Signed-off-by: Sean Madigan <[email protected]>
(cherry picked from commit 90eeeeb)
* Add CONFIG_OPENTHREAD_PLATFORM_MESSAGE_MANAGEMENT to allow enabling
message management by the platform.
* Add implementation of `otPlatMessagePoolInit`, `otPlatMessagePoolNew`
and `otPlatMessagePoolFree`.

Signed-off-by: Adrian Gielniewski <[email protected]>
(cherry picked from commit 9fd9e23)
(cherry picked from commit 4f3ef0a)
Disabled data caching for nRF54H20dk in wdt_basic_api test.
It caused variables stored in noinit section to be cached,
resulting in reset loop.

Upstream PR #: 81438

Signed-off-by: Michał Stasiak <[email protected]>
(cherry picked from commit 3d0bbe4)
The hal_nordic revision was updated to bring in NRFX v3.8.0.

Aligned the uses of single-instance API to use multi-instance instead.

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit d600769)
(cherry picked from commit 17a8b68)
Added a binding description for the PPIB peripheral and added the device
tree nodes of the PPIB instances to the nRF54L15 and nRF54L20.

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit 61d7293)
(cherry picked from commit 9338e2a)
The new nrfx_ppib driver can now be enabled, when the corrensponding
device tree node has the okay status.

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit bf66012)
(cherry picked from commit 0c45635)
The resource reservation definitions were moved to a separate header
file.

The PPIB and DPPI channel and group resources can now be statically
allocated for each individual instance.

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit 40d9dae)
(cherry picked from commit cb32d93)
The nrfx_gppi module is an abstraction over nrfx_ppi and nrfx_dppi
drivers. It now has a Kconfig option that is separate from nrfx_dppi and
by default it enables all PPI/DPPI instances, if available.

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit e184109)
(cherry picked from commit 39b4822)
…ader

The resource reservation header is now included according to a Kconfig
value. The Kconfig can be overriden out-of-tree in case a different
header is needed.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit b115083)
…RIES

The NRF54L_SERIES define is more specific and should be used in favor of
LUMOS_XXAA.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit dc36d3b)
Added dppic0 node label, alongside the dppic to maintain backward
compatibility. The use of dppic0 is preferred.

Upstream PR #: 81602

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit 2e2ce12)
Added ncs-specific modules to nrfx_config_reserved_resources.
The modules are:
- mpsl
- nrfe

Signed-off-by: Rafał Kuźnia <[email protected]>
(cherry picked from commit 89bad3f)
…onary mode

Extend STM logger test.
Use nrfutil trace to decode STM logs in dictionary mode.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit f0eba33)
(cherry picked from commit 4ba4768)
Set Address behavior is not specified when wValue is greater than 127,
or if wIndex or wLength are non-zero. USB stack did check wValue and
wLength but didn't care about wIndex value. Extend the check so non-zero
wIndex also results in STALL response.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit 54dc011)
(cherry picked from commit f2032ba)
USBD peripheral automatically handles Set Address command which can
lead to state mismatch between USB stack and the host. Keep track of
device address and issue fake Set Address commands on mismatch.

This fixes default vs addressed state mismatch that can occur due to
sufficently high SETUP handling latency. The state mismatch was most
commonly seen as SET CONFIGURATION failure when the enumeration happened
during periods with increased latency.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit e3acf5f)
(cherry picked from commit ee1a57a)
pdgendt and others added 20 commits December 12, 2024 10:42
… & B904)

Catch explicit exceptions and pass them them to the ValueError

See
https://docs.astral.sh/ruff/rules/bare-except/
https://docs.astral.sh/ruff/rules/raise-without-from-inside-except/

Signed-off-by: Pieter De Gendt <[email protected]>
(cherry picked from commit f7902bc)

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Replace .format() calls with f-strings.

See https://docs.astral.sh/ruff/rules/f-string/

Signed-off-by: Pieter De Gendt <[email protected]>
(cherry picked from commit 775db0e)

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Wrap long lines to max 100 characters.

See https://docs.astral.sh/ruff/rules/line-too-long/

Signed-off-by: Pieter De Gendt <[email protected]>
(cherry picked from commit 336c7da)

Signed-off-by: Tomasz Chyrowicz <[email protected]>
Use sysbuild to build and configure SUIT Manifest Provisioning
Information.

Signed-off-by: Tomasz Chyrowicz <[email protected]>
(cherry picked from commit 866e690)
fixup! [nrf noup] dfu/boot/mcuboot: fix confirmation in case of USE_PARTITION_MANAGER

Fixes this code to correctly check which slot is active, albeit
without firmware loader support

Signed-off-by: Jamie McCrae <[email protected]>
…05/l10 targets

nRF54L05 and nRF54L10 devices that are emulated on nRF54L15
needs to have manually disabled remaining RAM blocks
that are outside of their RAM region definitions.

Upstream PR #: 82262

Signed-off-by: Nikodem Kastelik <[email protected]>
Noup as it patches code that does not exist in zephyr
arch_busy_wait and k_busy_wait waited half the expected time
due to SystemCoreClock being set back to the default value when ns
builds. Changed to rely on device tree as to avoid
hardcoded clock frequencies

Signed-off-by: Dag Erik Gjørvad <[email protected]>
Pulls PR that removed nRF Wi-Fi.

(cherry picked from commit e512151)

Signed-off-by: Chaitanya Tata <[email protected]>
Commit e512151("manifest: hal_nordic: Pull nRF Wi-Fi removal")
mistakenly added a temporary local file.

Signed-off-by: Chaitanya Tata <[email protected]>

(cherry picked from commit 7658adf)
Including not removing a workaround in the UART driver for bsim targets

(cherry picked from commit 6c7b38f)

Signed-off-by: Alberto Escolar Piedras <[email protected]>
…test suit blob

See zephyrproject-rtos/hal_nordic#267 for
additional details.

(cherry picked from commit 96f2b2f)

Signed-off-by: Carles Cufi <[email protected]>
Update hal_nordic revision to include nrfs services:
- GDPWR
- GDFS

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
nRFs exposes now all power domains, following their actual name in the
specification. Add support for all of them in the GPD service. Note that
this is a breaking change: running this code requires a new SCFW as IDs
have changed in nRFs and so SCFW.

Upstream PR #: 81735

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Adding the implementation for the GDFS service

Upstream PR #: 81735

Signed-off-by: Paweł Pelikan <[email protected]>
Add specific device model for global hsfll clock and update dts tree
to use specific model. The clock is not fixed, and configurable at
runtime to predefined frequencies specified by the platform.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
The nrf-hsfll was previously the only supported HSFLL clock, hence it
was not namespaced fully. Since we added nrf-hsfll-global, we should
add the namespace to nrf-hsfll as well.

Updates drivers and devicetree uses of HSFLL as well.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
…fsll clock

Add device driver support for global hsfll clock.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
… hsfll

Extend sample to support global hsfll clock control.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
…lock

Extend test suite to test global HSFLL clock.

Upstream PR #: 81735

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC is promptless so it cannot
be selected. Moreover it's also automatically enabled by
CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE in the same overlay file
so there would be no need to explicitly enable it.

As for the IMPORT, EXPORT, DERIVE they are needed for the TLS connection
to work properly. Previously it was working because at least IMPORT and
EXPORT are internally enabled by Mbed TLS at build time. So here we
are basically doing the same enablements with Kconfigs in clear.

Upstream PR #: 82862

Signed-off-by: Valerio Setti <[email protected]>
Signed-off-by: Frank Audun Kvamtrø <[email protected]>
(cherry picked from commit 85b07784ff9658ee1ecd3a4a2f09550839ad17d6)
@shanthanordic
Copy link

Is this blocker for NCS 2.9.0 release @barsok or @frkv

@shanthanordic shanthanordic removed this from the ncs-2.9.0 milestone Dec 16, 2024
@shanthanordic
Copy link

Cleared milestone

@frkv
Copy link
Contributor Author

frkv commented Dec 17, 2024

Delayed to after the release. This will be picked up by the next upmerge (zephyrproject-rtos/zephyr#82862 which had the fromlist is now merged into zephyr main)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport v3.7.99-ncs2-branch Relates to NCS v2.9-branch bugfix

Projects

None yet

Development

Successfully merging this pull request may close these issues.