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

[DNM]: Upmerge TF-M 2.1.0 Mbed TLS 3.6.0 #2016

Open
wants to merge 1,551 commits into
base: main
Choose a base branch
from

Conversation

frkv
Copy link
Contributor

@frkv frkv commented Sep 10, 2024

Not for review purposes, only for CI

Please do not review

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Sep 10, 2024

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

Name Old Revision New Revision Diff
acpica zephyrproject-rtos/acpica@da5f272 (master) zephyrproject-rtos/acpica@8d24867 (zephyr) zephyrproject-rtos/[email protected]
cmsis-nn zephyrproject-rtos/cmsis-nn@0c8669d (zephyr) zephyrproject-rtos/cmsis-nn@ea987c1 (zephyr-v6.0.0) zephyrproject-rtos/[email protected]
hal_adi N/A zephyrproject-rtos/hal_adi@de5dadb (main) N/A
hal_altera zephyrproject-rtos/hal_altera@0d225dd zephyrproject-rtos/hal_altera@4fe4df9 (master) zephyrproject-rtos/[email protected]
hal_ambiq zephyrproject-rtos/hal_ambiq@94dd874 zephyrproject-rtos/hal_ambiq@df4a986 zephyrproject-rtos/[email protected]
hal_atmel zephyrproject-rtos/hal_atmel@d6221e7 zephyrproject-rtos/hal_atmel@56d60eb (master) zephyrproject-rtos/[email protected]
hal_espressif zephyrproject-rtos/hal_espressif@c495811 zephyrproject-rtos/hal_espressif@aa6a967 zephyrproject-rtos/[email protected]
hal_infineon zephyrproject-rtos/hal_infineon@b1a4723 zephyrproject-rtos/hal_infineon@88d2529 (master) zephyrproject-rtos/[email protected]
hal_intel zephyrproject-rtos/hal_intel@7b4c256 zephyrproject-rtos/hal_intel@0905a52 zephyrproject-rtos/[email protected]
hal_microchip zephyrproject-rtos/hal_microchip@1279561 zephyrproject-rtos/hal_microchip@71eba05 (master) zephyrproject-rtos/[email protected]
hal_nordic zephyrproject-rtos/hal_nordic@d4030af zephyrproject-rtos/hal_nordic@af7b21c zephyrproject-rtos/[email protected]
hal_nuvoton zephyrproject-rtos/hal_nuvoton@ab342e6 zephyrproject-rtos/hal_nuvoton@466c3ee (master) zephyrproject-rtos/[email protected]
hal_nxp zephyrproject-rtos/hal_nxp@5e84f1d zephyrproject-rtos/hal_nxp@7781570 zephyrproject-rtos/[email protected]
hal_renesas zephyrproject-rtos/hal_renesas@b4fe892 zephyrproject-rtos/hal_renesas@1ec8891 zephyrproject-rtos/[email protected]
hal_silabs zephyrproject-rtos/hal_silabs@0c39ee2 zephyrproject-rtos/hal_silabs@4c813a1 zephyrproject-rtos/[email protected]
hal_st zephyrproject-rtos/hal_st@b77157f zephyrproject-rtos/hal_st@b2f548f (master) zephyrproject-rtos/[email protected]
hal_stm32 zephyrproject-rtos/hal_stm32@ed93098 zephyrproject-rtos/hal_stm32@c4099c2 zephyrproject-rtos/[email protected]
hal_ti zephyrproject-rtos/hal_ti@b85f86e zephyrproject-rtos/hal_ti@2e7b95a (master) zephyrproject-rtos/[email protected]
hostap zephyrproject-rtos/hostap@83574f5 zephyrproject-rtos/hostap@cbae017 zephyrproject-rtos/[email protected]
libmetal zephyrproject-rtos/libmetal@243eed5 zephyrproject-rtos/libmetal@a6851ba (master) zephyrproject-rtos/[email protected]
littlefs zephyrproject-rtos/littlefs@408c16a zephyrproject-rtos/littlefs@009bcff (zephyr) zephyrproject-rtos/[email protected]
lz4 zephyrproject-rtos/lz4@8e303c2 zephyrproject-rtos/lz4@11b8a1e (zephyr) zephyrproject-rtos/[email protected]
mbedtls zephyrproject-rtos/mbedtls@3217c45 zephyrproject-rtos/mbedtls@fb36f3f zephyrproject-rtos/[email protected]
mcuboot zephyrproject-rtos/mcuboot@018dc01 zephyrproject-rtos/mcuboot@e890df7 (upstream-sync) zephyrproject-rtos/[email protected]
nanopb zephyrproject-rtos/nanopb@7f88274 zephyrproject-rtos/nanopb@4474bd3 (master) zephyrproject-rtos/[email protected]
net-tools zephyrproject-rtos/net-tools@7c7a856 zephyrproject-rtos/net-tools@93acc8b zephyrproject-rtos/[email protected]
open-amp zephyrproject-rtos/open-amp@da78aea zephyrproject-rtos/open-amp#21 zephyrproject-rtos/open-amp#21/files
percepio zephyrproject-rtos/percepio@7f6fb3f zephyrproject-rtos/percepio@b68d179 (zephyr) zephyrproject-rtos/[email protected]
picolibc zephyrproject-rtos/picolibc@764ef4e zephyrproject-rtos/picolibc@06bde1f zephyrproject-rtos/[email protected]
sof zephyrproject-rtos/sof@c11a318 zephyrproject-rtos/sof@0e4c4ef zephyrproject-rtos/[email protected]
tf-m-tests zephyrproject-rtos/tf-m-tests@85f533a zephyrproject-rtos/tf-m-tests@d552e4f (main) zephyrproject-rtos/[email protected]
tflite-micro zephyrproject-rtos/tflite-micro@1a34dca (main) zephyrproject-rtos/tflite-micro@48613f7 (zephyr) zephyrproject-rtos/[email protected]
trusted-firmware-a zephyrproject-rtos/trusted-firmware-a@421dc05 zephyrproject-rtos/trusted-firmware-a@713ffbf (master) zephyrproject-rtos/[email protected]
trusted-firmware-m zephyrproject-rtos/trusted-firmware-m@785d874 zephyrproject-rtos/trusted-firmware-m@a11cd27 (main) zephyrproject-rtos/[email protected]
uoscore-uedhoc zephyrproject-rtos/uoscore-uedhoc@150f4eb zephyrproject-rtos/uoscore-uedhoc@84ef879 (zephyr) zephyrproject-rtos/[email protected]
zcbor zephyrproject-rtos/zcbor@75d0880 (release/0.8.2) zephyrproject-rtos/zcbor@47f34dd zephyrproject-rtos/[email protected]

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

bjarki-andreasen and others added 25 commits September 25, 2024 15:59
Add build for nrf7002eb shield on thingy53 board.

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

Upstream PR: zephyrproject-rtos/zephyr#78330
Makes the boot banner function weak, this resolves an issue when
building with llext enabled which uses different build options
than a normal zephyr build

Signed-off-by: Jamie McCrae <[email protected]>
…ken from dt

Currently a user, or a shield definition, must select a Kconfig to
signal that the iovdd_ctrl and bucken GPIOs are connected to the same
pin. We can instead check this in the driver by simply checking if
the iovdd_ctrl_spec and bucken_spec are the same pin.

Update the nrfwifi driver and remove the redundant
NRF_WIFI_COMBINED_BUCKEN_IOVDD_GPIO config.

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

Upstream PR: zephyrproject-rtos/zephyr#78485
In NCS to leverage HW acceleration, use nRF security.

Also, fix Kconfig warnings in NCS compliance for CRYPTO_ALT.

Signed-off-by: Chaitanya Tata <[email protected]>
External flash support is still WIP, so, to get sysbuild working add
dummy Kconfig options.

Signed-off-by: Chaitanya Tata <[email protected]>
fixup! [nrf noup] mbedtls: Add dependency logic for PSA crypto
configurations

-Selecting CHACHA20 key type if PSA_WANT_ALG_STREAM_CIPHER is
 enabled

(fixup of commit 47a1e03)

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Although ZVFS is experimental, the warning is annoying the matter team.
Therefore, remove the experimental selection.

This may be reverted once upstream unselects experimental.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
This should be removed once
zephyrproject-rtos/open-amp#21 is merged.

Signed-off-by: Bjarki Arge Andreasen <[email protected]>
External projects building the documentation may not clone all modules, as
they have manifest filtering. Therefore, not having access to a module
should not produce a fatal documentation build error. Convert the error to
a debug log, so it is at least traced.

Upstream PR: zephyrproject-rtos/zephyr#78876

Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Bjarki Arge Andreasen <[email protected]>
-Enabling MBEDTLS_ECP_DP_SECP256R1_ENABLED curve type to ensure
 we don't get error-warnings about MBEDTLS_ECP_C dependencies not being
 met for WIFI samples.

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
[SHEL-2054] Adding a kconfig option for WMM.
By default it will be enabled. If user needs
to disable it, set it as n.

Tagged as "noup" because I had to fix a conflict because of another
"noup".

Upstream PR: zephyrproject-rtos/zephyr#76754

Signed-off-by: Kapil Bhatt <[email protected]>
…d FAE table

Adds HCI support for:
- LE CS Read Remote Supported Capabilities
- LE CS Read Remote FAE Table

Callbacks have been added to the conn object to allow upper layers to
make use of the cache commands, with which it will be possible to store
this information and provide it again in the case of a disconnect
and reconnect to the same device.

Upstream PR: zephyrproject-rtos/zephyr#78455

Signed-off-by: Olivier Lesage <[email protected]>
Adds HCI support for the LE CS Test command.

Upstream PR: zephyrproject-rtos/zephyr#78455

Signed-off-by: Olivier Lesage <[email protected]>
Some of the http_server tests suites were missing netif dependency.

Upstream PR: zephyrproject-rtos/zephyr#78977

Signed-off-by: Robert Lubos <[email protected]>
-We don't use this mechanism in nRF Connect SDK

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
…nload

-We handle legacy Crypto API support specially (favoring PSA crypto)
 the tests here require MD interface to build, which needs the config
 MBEDTLS_LEGACY_CRYPTO_C to be enable to get access to

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
-This adds crypto support for ipv6 tests by enabling
 CONFIG_MBEDTLS_LEGACY_CRYPTO_C

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Reorder functions in order to remove forward function defitions.
No functional changes.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit 2c78a4d)
When the queue is full, all messages posted inside interrupt handlers
are simply dropped. This problem can be remedied by having the message
queue large enough, but determining the maximum number of messages that
can ever be posted in the system is really complex task.

Hopefully in DWC2 driver there is finite number of events that have to
be processed inside thread handler. Therefore it is unnecessary to
determine the maximum queue size for the events if the events are posted
to k_event object instead of send to k_msgq object.

Use combination of three k_event structures to handle all possible event
sources. This not only guarantees by design that no event will be lost,
but also slightly reduces the memory usage.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit c2f2d8c)
UDC API handlers and DWC2 driver thread share not only software
constructs, but also the underlying hardware. Ensure that any UDC API
call is not preempted by DWC2 driver thread (and vice versa) by
acquiring the lock in thread handler.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit 5fc0405)
Enter hibernation in thread context with the lock held to make sure to
not queue any transfers when the core is hibernated.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit f765026)
The PMU is not reset by core reset and therefore it is necessary to exit
hibernation on DWC2 disable to prevent endless PMU interrupt loop when
the driver is enabled again.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit b89b7ed)
Add missing GHWCFG2 and GHWCFG3 defines based on nRF54H20 registers
documentation.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit 68b8818)
According to USB 2.0 Specification the remote wakeup device must hold
the resume signaling for at least 1 ms but for no more than 15 ms. The
DWC2 otg controller requires the software to drive the remote wakeup
signalling for appropriate duration (when LPM is disabled, which is
currently always the case in udc_dwc2). Arbitrarily choose to drive the
resume signalling for 2 ms to have sufficient margin in both directions.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit ac7d55b)
-base64 API belongs to the Mbed TLS deliverable. This avoids taking in
 the duplicated APIs from hostap

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment