Upmerge 20230824 #1294
Merged
Upmerge 20230824 #1294
Conversation
This file contains 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
de-nordic
requested review from
aescolar,
nordic-krch,
alwa-nordic,
carlescufi,
stephanosio,
jakub-uC,
rlubos,
nordicjm,
carlocaione,
Thalley,
anangl,
jfischer-no,
gmarull,
jciupis,
tejlmand,
koffes,
alexsven,
erikrobstad,
rick1082,
gWacey and
lemrey
as code owners
de-nordic
force-pushed
the
upmerge-20230824
branch
5 times, most recently
from
1f6e806
to
f3607ad
Compare
de-nordic
force-pushed
the
upmerge-20230824
branch
from
f3607ad
to
200f1a3
Compare
Move the custom commands creating the version.h and app_version.h below the Zephyr modules sourcing. This allows custom user specific Zephyr modules to adjust the value of KERNEL_VERSION_CUSTOMIZATION and APP_VERSION_CUSTOMIZATION values and thereby make use of the functionality introduced with #61635. The creation of the version_h and app_version_h targets, which drives the custom commands, are kept at their current location. This ensure that the targets themselves are still defined when the Zephyr and Zephyr modules CMakeLists trees are sourced. Upstream PR: zephyrproject-rtos/zephyr#62395 Signed-off-by: Torsten Rasmussen <[email protected]> (cherry picked from commit 96a0d4e) Signed-off-by: Dominik Ermel <[email protected]>
wifi_utils_parse_scan_bands could cause a crash if a constant string is passed to it. Fix this by duplicating the input string parameter before parsing it with strtok_r. Signed-off-by: Sachin D Kulkarni <[email protected]> (cherry picked from commit 0b92327) Signed-off-by: Dominik Ermel <[email protected]>
wifi_utils_parse_scan_ssids could cause a crash if a constant string is passed to it. Fix this by duplicating the input string parameter before parsing it with strtok_r. Also limit the range of the CONFIG_WIFI_SCAN_SSID_FILT_MAX parameter from 1 to 4 to avoid stack overflow due to users specifying a large value for this parameter. Signed-off-by: Sachin D Kulkarni <[email protected]> (cherry picked from commit 85b39b8) Signed-off-by: Dominik Ermel <[email protected]>
…election This change brings in support for setting various Wi-Fi modes and enables a specific Wi-Fi interface to be also placed into a sniffer operation via monitor mode and promiscuous mode. A raw TX- packet Injection mode is also introduced Signed-off-by: Vivekananda Uppunda <[email protected]> (cherry picked from commit 450dbb1) (cherry picked from commit 9226e1f) Signed-off-by: Dominik Ermel <[email protected]>
In low memory conditions, its possible for socketpair memory allocation to fail and then the socketpair is freed but after that the remote semaphore is released causing a crash. Fix this by freeing the socketpair after releasing the semaphore. Add a test case to induce low memory conditions (low HEAP and high socketpair buffer size), with the fix issue is not seen. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 40ee879) Signed-off-by: Dominik Ermel <[email protected]>
Adds support for twister to require using snippets on tests Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit bc97d8f) (cherry picked from commit a9d71eb) Signed-off-by: Dominik Ermel <[email protected]>
Add support handling quotes for configuration options in extra args by escaping them properly instead of removing the quotes altogether. For other options in extra_args quotes are removes as usual. Add similar support in west build command also. Add a unit test to check this functionality. Signed-off-by: Chaitanya Tata <[email protected]> (cherry picked from commit 6b05af6) (cherry picked from commit 81b838d) Signed-off-by: Dominik Ermel <[email protected]>
…guration The commit adds support for uploading images to secondary slots of three images. (cherry picked from commit ea6129c) Signed-off-by: Dominik Ermel <[email protected]>
The header file contains mixture of functions and static arrays. Replacing static arrays to functions. Initialize functions in C file. Signed-off-by: Kapil Bhatt <[email protected]> (cherry picked from commit 4b9f5cc) (cherry picked from commit 1db9974) Signed-off-by: Dominik Ermel <[email protected]>
The CONFIG_NET_L2_WIFI_SHELL isn't always enabled. But these functions might still be used, so need to move functions into mgmt. Signed-off-by: Kapil Bhatt <[email protected]> (cherry picked from commit 29bbcb1) (cherry picked from commit a47925f) Signed-off-by: Dominik Ermel <[email protected]>
Fix missing Coded PHY implementation conditional compile causing compile error when disabling Coded PHY support in SoCs that have radio that support Coded PHY. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit e8fe144) Signed-off-by: Dominik Ermel <[email protected]>
The tests `content_json` and `content_plain_test` depend on the float support of libc. After PR##57340, Picolibc would be selected in these two tests and the `PICOLIBC_IO_FLOAT` won't be selected if the platform doesn't select `FPU`. This commit select `CONFIG_PICOLIBC` and `CONFIG_PICOLIBC_IO_FLOAT` for these two tests. Signed-off-by: Huifeng Zhang <[email protected]> (cherry picked from commit 5a1a1fe13d88c6429d2cf80975aaea3302441ce1) Signed-off-by: Dominik Ermel <[email protected]>
There is no point to use PICOLIB here as it bloats the tests. Signed-off-by: Dominik Ermel <[email protected]>
…t_name memcpy makes more sense here. Upstream PR: zephyrproject-rtos/zephyr#63112 Signed-off-by: Dominik Ermel <[email protected]>
The bad DMA request was observed as SPU FLASHACCERR when building for nrf5340dk_nrf5340_cpuapp_ns target. The bad DMA request would manifest itself as device failing to reconnect after USB cable was reconnected. The issue was especially visible with CDC ACM sample because SET LINE CODING request has 7 bytes payload. (cherry picked from commit c796e1b) Signed-off-by: Tomasz Moń <[email protected]>
Add missing MCUBOOT_USB_SUPPORT Kconfig type to fix doc build. Signed-off-by: Mateusz Kapala <[email protected]>
This commit adds the documentation details for the linkserver support on rt1170. Signed-off-by: Yves Vandervennet <[email protected]> (cherry picked from commit 1477865) Signed-off-by: Dominik Ermel <[email protected]>
- Remove duplicated labels (not sure why they were not spotted by doc CI?) - Fix titles Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 0371708) Signed-off-by: Dominik Ermel <[email protected]>
Only provide implementations for optional operations if needed. This patch deletes quite a few dummy `pin_interrupt_configure` ops (now optional), and adjusts ifdeffery on some drivers so that optional ops are only provided if they implement real functionality. Signed-off-by: Gerard Marull-Paretas <[email protected]> (cherry picked from commit 64968d7) Signed-off-by: Dominik Ermel <[email protected]>
Change introduces a new configuration option that can be used to disable GPIO interrupt support to reduce memory footprint. Signed-off-by: Marek Pieta <[email protected]> (cherry picked from commit 44c723e) Signed-off-by: Dominik Ermel <[email protected]>
…f_set_name Replaced with memcpy. (cherry picked from commit 47396e1) Signed-off-by: Dominik Ermel <[email protected]>
This splits defines to a separate file, which are commonly needed by out-of-tree projects whereby the full MCUmgr include cannot be used due to undefined types being used. Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit a15752c) Signed-off-by: Dominik Ermel <[email protected]>
… interrupt API This commit fixes an issue with the nrfx uarte driver to allow the async and interrupt driven UART APIs to coexist on different uart instances. As both APIs cannot be used simultaneously for a given instance, there is no need to handle CONFIG_UART_EXCLUSIVE_API_CALLBACKS in this driver. Signed-off-by: Eivind Jølsgard <[email protected]> (cherry picked from commit 66069b3) Signed-off-by: Dominik Ermel <[email protected]>
…e_scan_cb_register Update the tests to use bt_le_scan_cb_register and the "new" scan callback, as that is better suited to handle extended advertising. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit 9064170) Signed-off-by: Dominik Ermel <[email protected]>
The purpose of this test is to verify that the stack has the correct behavior if the ACL disconnects while one or more streams are in the streaming state. The main point it validates is that unicast server device can restart advertising using a simple k_work in the disconnected callback. The number of connections supported by the test suite has also been reduced to 3, to avoid some seen issues with scheduling when CONFIG_BT_MAX_CONN=5. A part of implementing the test for this purpose, the unicast client and unicast server have been extended to also advertise and scan for proper ASCS advertising data. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit 01f7d10) Signed-off-by: Dominik Ermel <[email protected]>
Instead of calling ase_release for each ASE in the ACL disconnected callback, we now call the state_transition_work_handler directly. This is to ensure that when the disconnected callback returns, the bt_conn object has been properly unref'ed in a timely manner. Signed-off-by: Emil Gydesen <[email protected]> (cherry picked from commit c3c83c7) Signed-off-by: Dominik Ermel <[email protected]>
Adds the psa_util.c conditionally, where needed. Signed-off-by: Dominik Ermel <[email protected]>
de-nordic
force-pushed
the
upmerge-20230824
branch
from
37e0099
to
edf807f
Compare
Merged
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.
Upmerge of Zephyr, currently to
2e3193ea768a05Carles found instead https://github.com/zephyrproject-rtos/zephyr/commits/a768a05e6205e415564226543cee67559d15b736 to be the base
Carles is right.