This reverts commit b3ec345.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 4dd0af5.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit da1af7e.

Signed-off-by: Robert Lubos <[email protected]>

…ct` command"

This reverts commit 73bef57.

Signed-off-by: Robert Lubos <[email protected]>

… get opt parsing"

This reverts commit 08dee4b.

Signed-off-by: Robert Lubos <[email protected]>

… platform allow"

This reverts commit 51c8066.

Signed-off-by: Robert Lubos <[email protected]>

…ccess"

This reverts commit 2d2a2e0.

Signed-off-by: Robert Lubos <[email protected]>

…ement API"

This reverts commit 955ca26.

Signed-off-by: Robert Lubos <[email protected]>

…gement"

This reverts commit 4fa036e.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 1758a32.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit ffbf62c.

Signed-off-by: Robert Lubos <[email protected]>

…_posix"

This reverts commit 1552882.

Signed-off-by: Robert Lubos <[email protected]>

…ore samples"

This reverts commit cce7219.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 634bfae.

Signed-off-by: Robert Lubos <[email protected]>

…n nRF54L"

This reverts commit b320a9e.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 2ef7c81.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 570c8c2.

Signed-off-by: Robert Lubos <[email protected]>

… devices"

This reverts commit f50ad41.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 253ee08.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 63c8c9d.

Signed-off-by: Robert Lubos <[email protected]>

…dc_api test"

This reverts commit 2da6498.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 51f7968.

Signed-off-by: Robert Lubos <[email protected]>

…54L15 device"

This reverts commit 57de7d1.

Signed-off-by: Robert Lubos <[email protected]>

…s output set high"

This reverts commit 3733e70.

Signed-off-by: Robert Lubos <[email protected]>

…54 TWIS"

This reverts commit 28e2f57.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit f706d53.

Signed-off-by: Robert Lubos <[email protected]>

…54h20"

This reverts commit 5660de7.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit a412cab.

Signed-off-by: Robert Lubos <[email protected]>

…n call"

This reverts commit 8e66a57.

Signed-off-by: Robert Lubos <[email protected]>

…ting"

This reverts commit f5c0d31.

Signed-off-by: Robert Lubos <[email protected]>

…in suspend"

This reverts commit 6e61c5e.

Signed-off-by: Robert Lubos <[email protected]>

…d nrf54h20"

This reverts commit 09df3e0.

Signed-off-by: Robert Lubos <[email protected]>

…futil."

This reverts commit ddca511.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit c90430f.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 5c48490.

Signed-off-by: Robert Lubos <[email protected]>

…nings"

This reverts commit 1155e53.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit d152f62.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 05ff843.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 2aba137.

Signed-off-by: Robert Lubos <[email protected]>

…um version"

This reverts commit 22df05a.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 920b9fc.

Signed-off-by: Robert Lubos <[email protected]>

…ER_XXX"

This reverts commit ecb16c7.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit e6f8064.

Signed-off-by: Robert Lubos <[email protected]>

This reverts commit 5579010.

Signed-off-by: Robert Lubos <[email protected]>

… network core"

This reverts commit d931964.

Signed-off-by: Robert Lubos <[email protected]>

… test_plan.py script"

This reverts commit 38b93c8.

Signed-off-by: Robert Lubos <[email protected]>

Regular upmerge.

Signed-off-by: Robert Lubos <[email protected]>

…an.py script

In twister, applying quarantine is a part of apply_filters() function.
However, this function is not called when --load-test is used.
Therefore, if one wants to use quarantines in combination with
dynamic scope from the test_plan.py script, one has to pass such
info through the script.

Signed-off-by: Maciej Perkowski <[email protected]>
(cherry picked from commit 48665f2)
Signed-off-by: Robert Lubos <[email protected]>

Add all of the PSA specification defined algorithms and key types.
This makes the configurations independent of what is supported by the
specific implementation.
Add configurations for internal logic to see if a feature is enabled by
PSA_WANTS_XXX.

ref: NCSDK-11689
ref: NCSDK-17840
ref: NCSDK-17840
ref: NCSDK-26057

Add PSA symbols for Oberon extension to the PSA specification.
Mbed TLS has adopted the same naming, so while this is not part of the
PSA specification it is fine to add it to the generic configuration
for both implementations.

Add config support for PBKDF2_HMAC.
Add config support for PBKDF2_AES_CMAC_PRF_128

Signed-off-by: Frank Audun Kvamtrø <[email protected]>
Signed-off-by: Vidar Lillebø <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Markus Swarowsky <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Maciej Baczmanski <[email protected]>
Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 0a78b66)
(cherry picked from commit b850ab7)
(cherry picked from commit 33121ff)
(cherry picked from commit 1fab667)
(cherry picked from commit 0708dc8)
(cherry picked from commit 93ad09a)
(cherry picked from commit d284b18)
(cherry picked from commit 746b326)
(cherry picked from commit 76b0463)
(cherry picked from commit 5579010)

Add some socket options and address family extensions to Zephyr
headers, which will be useful for nRF Connect SDK.

Add secure socket options:
* Add CID socket options to NCS specific options.
* Add TLS/DTLS tls ciphersuite chosen socket option to NCS specific
  options.
* Add TLS/DTLS connection save/load socket options to NCS specific
  options.
* Add TLS/DTLS handshake status socket option to NCS specific options.

* Add SO_KEEPOPEN socket option.
* Add SO_RAI socket option, deprecate the old ones.

The "author" of this commit is a contact person; various people with
s-o-b lines following here have contributed to the maintenance of this
patch.

Signed-off-by: Andreas Moltumyr <[email protected]>
Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Christopher Métrailler <[email protected]>
Signed-off-by: Emanuele Di Santo <[email protected]>
Signed-off-by: Glenn Ruben Bakke <[email protected]>
Signed-off-by: Håkon Alseth <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Jan Tore Guggedal <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Mirko Covizzi <[email protected]>
Signed-off-by: Petri Honkala <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Tommi Mammela <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Eivind Jølsgard <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit 3a641f9)
(cherry picked from commit 22f7690)
(cherry picked from commit e6f8064)

Require the presence of the nrf-regtool package as well as requiring
a minimum version, failing the build whenever a suitable version is not
found in the system.

Upstream PR: zephyrproject-rtos/zephyr#69633

Signed-off-by: Carles Cufi <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 0e13f61d8ed687a2cc428c8a0458f496e639bd70)
(cherry picked from commit 8d93a16)
(cherry picked from commit 3eb95e7)
(cherry picked from commit 22df05a)

This is a long-term noup patch because crypto driver support is
NCS-only for both cryptocell and CRACEN.

Set HAS_HW_NRF_CC3XX to be defined in NS build when cryptocell
is accessed through the PSA API.
We need to know which CC3XX features are available.

Set PSA as the entropy source for 54L.

PSA is the only NCS-supported interface to CRACEN.

Signed-off-by: Georgios Vasilakis <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 499041d)
(cherry picked from commit baa4ee7)
(cherry picked from commit 4fa3cc9)
(cherry picked from commit 2aba137)

Partition Manager (PM) is a component of the nRF Connect SDK (NCS)
which uses yaml files to resolve flash partition placement with a
holistic view of the entire device, including each firmware image
present on the flash device, and various subsystems, such as settings
and NFFS.

When this NCS extension is used, various source files which would use
partition information from devicetree in "vanilla" zephyr instead use
defines generated by PM instead.

This commit removes support for HEX_FILES_TO_MERGE, as it conflicts
with PM.

The settings subsystem pm.yml defines a partition 'settings_storage'.
The nffs subsystem pm.yml defines 'nffs_storage'.

Leverage label translation to avoid patching partition names.

Refer to the NCS documentation page for this feature for more details.

This is a long-running out of tree patch which has been worked on by
several people. The following sign-offs are in alphabetical order by
first name.

Signed-off-by: Andrzej Głąbek <[email protected]>
Signed-off-by: Andrzej Puzdrowski <[email protected]>
Signed-off-by: Håkon Øye Amundsen <[email protected]>
Signed-off-by: Ioannis Glaropoulos <[email protected]>
Signed-off-by: Joakim Andersson <[email protected]>
Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Martí Bolívar <[email protected]>
Signed-off-by: Ole Sæther <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
Signed-off-by: Sebastian Bøe <[email protected]>
Signed-off-by: Sigvart Hovland <[email protected]>
Signed-off-by: Thomas Stenersen <[email protected]>
Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Øyvind Rønningstad <[email protected]>
Signed-off-by: Trond Einar Snekvik <[email protected]>
Signed-off-by: Gerard Marull-Paretas <[email protected]>
Signed-off-by: Tomasz Moń <[email protected]>
Signed-off-by: Dominik Ermel <[email protected]>
(cherry picked from commit a7fb268)
(cherry picked from commit ea83f6c)
(cherry picked from commit 91b6032)

This adds temporary entropy driver simulation for
nRF54h20 device since final entropy source is not
available yet.

TODO: Remove this commit when proper solution will
be available.

Jira: NCSDK-25947

Signed-off-by: Kamil Gawor <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit c976657)
(cherry picked from commit e2b6a2d)

This commit adds the nRF54l15//nrf54l15/cpuapp/ns board variant to
sdk-zephyr. It allows to build nRF54l15pdk with TF-M in nRF Connect SDK.

This is done as a nrf noup patch as the out-of-tree board extension
feature is not available. When zephyrproject-rtos/zephyr#69548 is
completed, then this commit can be reverted and the variant be placed in
sdk-nrf repository.

Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit c8cc663)

Upstream PR: zephyrproject-rtos/zephyr#71609

Add devicetree nodes for the Reset Information registers on nRF54H20,
along with a new binding.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 8fe636b4d583b7f3d119d7e80094e3b5bfa52099)
(cherry picked from commit a72f221)

Upstream PR: zephyrproject-rtos/zephyr#71688

This commit aligns the GRTC driver to changes introduced in
hal_nordic. Some of the features regarding GRTC sleep/wakeup
functionality has been modified and moved out to the nrfx
driver's code.

Signed-off-by: Adam Kondraciuk <[email protected]>
(cherry picked from commit 88a50aa5ee0a01fe029676b916329dc75ca5deea)
(cherry picked from commit f7438b5)
Signed-off-by: Robert Lubos <[email protected]>

Each local RESETINFO instance can be used in samples.
Applied as `noup` because of conflicts.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit 04cb694)

Upstream PR: zephyrproject-rtos/zephyr#72010

Adds support for first possible LED to be connected with HW PWM.

Signed-off-by: Karol Lasończyk <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>

Zephyr's boot banner should not be used if NCS boot banner is enabled.

Signed-off-by: Robert Lubos <[email protected]>

nrf-squash! [nrf noup] drivers: spi_dw: add custom EXMIF peripheral handling

This is a follow-up to commit 7ea6937.

Add the "snps,designware-spi" compatible to the EXMIF node so that
the peripheral can be used with the spi_dw driver specially modified
for that purpose.

Signed-off-by: Andrzej Głąbek <[email protected]>

Commit 2f31ee6 ("usb: device_next: convert ASCII7 strings to
UTF16LE on the fly") made string descriptors respond with twice as much
of the actual string data.

Fix the issue by taking into account that USB string descriptor length
is already multiplied by two. Additionally, make it possible to return
odd number of bytes if host requested so.

Upstream PR: zephyrproject-rtos/zephyr#73079

Signed-off-by: Tomasz Moń <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>

Return protocol error if bcdUSB is less than 0x0201. Fix typo in number
of capabilities.

Fixes: b0d7d70 ("usb: device_next: add initial BOS support")

Upstream PR: zephyrproject-rtos/zephyr#73018

Signed-off-by: Johann Fischer <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>

Display diff of contents for large buffers is not quite helpful and
takes up huge RAM, and if a board has less RAM then this causes the test
module build failures.

So, disable display of diff and just log a failure, small buffer tests
can be used to debug such basic issues and large buffer tests can act as
a smoke test for debugging other issues. This saves about 80K of RAM.

Fixes #72792.

Upstream PR: zephyrproject-rtos/zephyr#72895

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

…W_SPLIT only

Build the vendor specific sample hci_vs_scan_req for
BT_LL_SW_SPLIT variant of the Controller only.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
(cherry picked from commit 68bd4da)
Signed-off-by: Robert Lubos <[email protected]>

PR #72592 made pylint to use json2 output format. However, this
format is introduced in pylint v3. This commit adds an appropriate
setting in the requirements file.

Signed-off-by: Maciej Perkowski <[email protected]>
(cherry picked from commit 3a3f25c)
Signed-off-by: Robert Lubos <[email protected]>

Use wdt31 instead of wdt30 as wdt30 is hardware fixed to secure.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 9ef16f5)
Signed-off-by: Robert Lubos <[email protected]>

Add missing nrf overlays to fix the sample at build time.

Copied from samples/drivers/watchdog/boards.

It is not clear why the build failure was not detected earlier.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit afbaaf2)
Signed-off-by: Robert Lubos <[email protected]>

…e domain

Don't define wdt30 for the non-secure domain as it is hardware fixed
to secure.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 50aaaa3)
Signed-off-by: Robert Lubos <[email protected]>

… domain

Don't define UICR for the non-secure domain as it is hardware fixed to
secure.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 2c19d3e)
Signed-off-by: Robert Lubos <[email protected]>

…r ns

Define peripherals with the 0x4000_0000 address range when building
for non-secure.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 90332b9)
Signed-off-by: Robert Lubos <[email protected]>

Refactor the 54L board file to be able to better support out-of-tree
non-secure boards.

This aligns better with nrf53's DT.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 80209e4)
Signed-off-by: Robert Lubos <[email protected]>

Complete rewrite of the 54l_ns DT board definition.

Now the secure board and non-secure board re-use a lot more code,
giving us a more maintainable solution.

Signed-off-by: Sebastian Bøe <[email protected]>

… set

When opaque resources have post-write callback set, but
the write is not a Block-Wise write, there is no block_ctx
and the code causes null pointer dereference when calculating
the offset of the data.

Upstream PR: zephyrproject-rtos/zephyr#73162

Signed-off-by: Seppo Takalo <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>

It made the build of
`samples/tfm_integration/tfm_psa_test/sample.tfm.psa_test_crypto`
break since the update of Mbed TLS to 3.6.0 (#71118), apparently because
`${ZEPHYR_BASE}` wasn't set, and the include doesn't seem to be needed.

Signed-off-by: Tomi Fontanilles <[email protected]>
(cherry picked from commit d830446)
Signed-off-by: Robert Lubos <[email protected]>

…eferences"

This reverts commit b876bd2.

That needs mbed TLS 3.6.0 to work, as pk_ecc.c was added in that
version.

To be reverted, when mbed TLS is updated to 3.6.0 in NCS.

Signed-off-by: Robert Lubos <[email protected]>

… lib is used

Socket service library uses eventfd, which does not work with
native_posix platform, hence need to exclude it from samples that now
rely on socket services.

Upstream PR: zephyrproject-rtos/zephyr#73256

Signed-off-by: Robert Lubos <[email protected]>

Upstream PR: zephyrproject-rtos/zephyr#73156

Adds channel 15 to the pool of grtc channels available
for allocation (i.e. with 'z_nrf_grtc_timer_chan_alloc')
on nRF54H20.

The change is motivated by lack of available channels
for the nrf_802154_timestamper when building for nRF54H20.

Signed-off-by: Piotr Koziar <[email protected]>

…ses when clock_control is not available.

Upstream PR: zephyrproject-rtos/zephyr#73156

Clock_control is currently not supported on nRF54H20.
This commit adds new way of handling the hfclk targeted for nRF54H20.

This solution shall be replaced once the clock_control is supported for nRF54H20.

Signed-off-by: Piotr Koziar <[email protected]>

Upstream PR: zephyrproject-rtos/zephyr#73156

This commit fixes the issue where a serialization
error was reported after properly sending a data with 'icbmsg' backend.

The icbmsg send function's return code is set to
the sent data's len as in other backends.
The related docs were fixed and updated.

Signed-off-by: Piotr Koziar <[email protected]>

…fault for nRF54H20.

Upstream PR: zephyrproject-rtos/zephyr#73156

Adds an appropriate condition to the Kconfig as
the temperature driver is not supported for nRF54H20 devices yet.

Without this change, a build with NRF 802.15.4 libraries produces Kconfig error.

Signed-off-by: Piotr Koziar <[email protected]>

… to create EUI64.

Upstream PR: zephyrproject-rtos/zephyr#73156

Use BLE.ADDR to create unique (to some extent) EUI64
on nRF54H20 in some cases inside the IEEE 802.15.4 driver.

The amount of EUI64-s available in such a way is very limited (~16 million).
However, currently there does not seem to be another feasible way to
get device identifiers on nRF54H20 (such are kept in SICR, to which the
radio core has no access).

Signed-off-by: Piotr Koziar <[email protected]>

When disconnect request is successful, the status
was taking as WIFI_REASON_DISCONN_UNSPECIFIED only.
Adding WIFI_REASON_DISCONN_SUCCESS which can be help
to determine status of disconnect request. If this status
is failed then reason can be useful.

Signed-off-by: Kapil Bhatt <[email protected]>
(cherry picked from commit cc42d16)
Signed-off-by: Robert Lubos <[email protected]>

…ntervals

BT_GAP_ADV_SLOW_INT_MIN and BT_GAP_ADV_SLOW_INT_MAX represent 1s and 1.2s, respectively,
in the extended advertising context, where the bit interval is 0.625 ms. Using them for
periodic advertising will result in a range of [2s, 2.4s], as the bit interval
for periodic advertising is 1.25ms.

Instead, BT_GAP_PER_ADV_SLOW_INT_MIN and BT_GAP_PER_ADV_SLOW_INT_MAX should be used in
this sample, and the range will become [1s, 1.2s].

Upstream PR: zephyrproject-rtos/zephyr#73418

Signed-off-by: Yuxuan Cai <[email protected]>

…UICR cleanup

The flasher was unconditionally cleaning the UICR area, even when the
application didn't have a new configuration generated. This can happen,
when CONFIG_NRF_REGTOOL_GENERATE_UICR=n. In such case, keep the old UICR
configuration on the device.

A real scenario where we should set CONFIG_NRF_REGTOOL_GENERATE_UICR=n
is when building multiple firmware images that are meant to run one
domain. The primary application build generates the UICR configuration
and secondary images don't. Before this change, the flashing process of
the primary application would write new UICR configuration, but the
flashing process of secondary images would erase it.

Upstream PR: zephyrproject-rtos/zephyr#73391

Signed-off-by: Rafał Kuźnia <[email protected]>

Add option for setting a random MAC address to
the net iface set_mac command. With random option
a random MAC address can be assigned to an interface.
[SHEL-2352].

Signed-off-by: Kapil Bhatt <[email protected]>
(cherry picked from commit 8a52b64)

Support to print name of the argument along with the value.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit 180c22a)

Support to set BSS parameter at compile and run time.

Added support to configure `max_inactivity` BSS parameter.
Station inactivity timeout is the period for which AP may keep a client
in associated state while there is no traffic from that particular client.
If a non-zero value is set, AP may choose to disassociate the
client after the timeout.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit c6d1a91)

…ip inactivity poll"

Support for configuration of AP parameter "Skip inactivity poll".
Only build time setting is supported.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit bedd38c)

…num_sta

Support to set BSS parameter "max_num_sta" at compile and run time

Added support to configure `max_num_sta` BSS parameter.
Maximum number of stations allowed in station table. New stations will be
rejected after the station table is full.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit d4b22cd)

Added support to set BSS parameter.
Added support set BSS parameter maximum inactivity time.
Added support set BSS parameter inactivity poll feature.
Added support set BSS parameter maximum number of STA entries.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit 76051bb)

Typo: "RTS threashold" changed to "RTS threshold".

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit e493d8c)

…t case

For default case it should print the option character provided by user.
Extra shell_help removed as it's being called in the caller function.

Signed-off-by: Ajay Parida <[email protected]>
(cherry picked from commit 91054be)

…Idle=0

When RxOnWhenIdle is set to False, turn the radio off
if no operation is ongoing in order to save power.

Upstream PR: zephyrproject-rtos/zephyr#73471

Signed-off-by: Eduardo Montoya <[email protected]>