Upmerge 2021 10 20 #637
Merged
Upmerge 2021 10 20 #637
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
before running timer's timeout function, we need to make sure that those threads waiting on this timer have been added into the timer's wait queue, so add operations to use timer lock to mask interrupts in z_timer_expiration_handler function to synchronize timer's wait queue. Signed-off-by: Chen Peng1 <[email protected]>
Corrects the spelling of "dealine" to "deadline". Signed-off-by: Peter Mitsis <[email protected]>
Adds information to the kernel scheduling documentation explaining how a thread's deadline is used to determine the thread's relative priority. Signed-off-by: Peter Mitsis <[email protected]>
Add networking relase notes based on commit history, for commits including "net" phrase in the title. Signed-off-by: Robert Lubos <[email protected]>
According to the state documentation, this state does not need to handle devices: > Runtime idle is a system sleep state in which all of the cores enter deepest possible idle state and wait for interrupts, no requirements for the devices, leaving them at the states where they are. Signed-off-by: Gerard Marull-Paretas <[email protected]>
Since the tests expects devices to change states, PM_STATE_RUNTIME_IDLE can't be used. The first state that cares about devices is PM_STATE_SUSPEND_TO_IDLE. Signed-off-by: Gerard Marull-Paretas <[email protected]>
Remove unnecessary condition that effectively limits the usability of the I2S format to two channels mode only. Although the description of the `i2s_config` structure contains a remark that for the I2S format the specified number of channels is ignored and always two are used, in fact only one other in-tree driver (i2s_sam_ssc) applies such limitation. The nRF I2S hardware has no problem with handling the I2S format with audio data for only one channel, so there is no need for having this limitation in the driver, and without such mode of operation of the driver it is impossible to feed it with PCM data directly from the PDM peripheral working in one channel mode. Signed-off-by: Andrzej Głąbek <[email protected]>
- correct the names of buffers used by message queues so that it is possible to have multiple instances of the driver (in case such need appears in the future) - make `stop` and `discard_rx` normal structure members, not bit fields, as they are modified in the interrupt handler and that could lead to overwriting of other bit fields located in the same memory unit - add a log message providing the actual frame clock (WS) frequency (i.e. PCM rate) that the driver was able to configure (due to hardware limitations, it is not always possible to achieve the exact requested frequency and the driver selects the closest one available, so make it more visible to users Signed-off-by: Andrzej Głąbek <[email protected]>
This allows IUT to return credits on specified L2CAP channel when requested by Upper Tester. Signed-off-by: Szymon Janc <[email protected]>
Rename ULL internal helper function to get the random address. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Explicitly typecast void return for memcpy calls. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Minor indentation fixes. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Fix implementation to populate the aux, and sync offset in the latest PDU. If both the current and latest of the double buffer has been filled and LLL did not pick the latest PDU, then the offset should be filled into the latest PDU (and not into the first/current PDU). Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Add implementation to set correct Advertiser's clock accuracy value in the auxiliary pointer field in the common extended payload format. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Add FIXME comments for missing use of channel selection algorithm for Periodic Advertising chained PDUs. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Add implementation defined channel index in the auxiliary pointer of the common extended payload format in the primary channel PDUs and the same be used in the transmission of auxiliary PDUs. Fixes #35668. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Use defines for aux pointer offset unit value. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Have separate Bluetooth Device address get and read functions, remove use of function just to return Extended Advertising Random address and replace with simple assignment statement. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Verify that the local identity loaded from the settings key is valid for the current configuration. Signed-off-by: Joakim Andersson <[email protected]>
Change the way the local IRKs are accessed to be consistent with the all other uses. Coverity thinks using the pointer to the array is suspicious in this case. Fixes: #38130 Signed-off-by: Joakim Andersson <[email protected]>
From time to time, measured slice time is one less/more than requested. Fixes #35793 Signed-off-by: Alexandre Bourdiol <[email protected]>
Fix deadlock in multiple peripheral connection in a device due to redundant double reservation of node rx buffer during crossover scenario in Data Length Update procedure. Data Length Update resize state was reset back to response wait state when peripheral received an acknowledgment to local initiated Data Length Request PDU after having already transitioned to resize state. Implementation is designed to transition to resize state under both Data Length Response reception and crossover scenario of Data Length Request reception when procedure is local initiated. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Removed the bt_conn_unref from the deferred_work function. For ISO, the conn unref for the peripheral will happen in the bt_iso_disconnected function. For the central, the unref shall only happen when the CIG is terminated. Signed-off-by: Emil Gydesen <[email protected]>
Fixes: #38403 Changing Bluetooth drivers from being a menu into a menuconfig. This aligns the Bluetooth driver configuration with other driver configurations as well as provides a setting which identifies if Bluetooth drivers has been enable. This further helps to avoid empty Zephyr libraries for bluetooth samples. Signed-off-by: Torsten Rasmussen <[email protected]>
Fixes: #38403 Adding NET_DRIVERS menuconfig so that network drivers are grouped together in its own menu entry under drivers, similar to most other drivers. This further has the advantages that `CONFIG_NET_DRIVERS` can be used for testing to determine if network drivers has been selected. This changed revealed a dependency loop where both `select` (for SLIP) and `depends` (for PPP) which both depends on NET_DRIVERS` where in use in the dependency tree for Qemu networking, especially NET_SLIP_TAP. This is handled by defaulting `NET_DRIVERS` to `y` when building for a Qemu target. `SLIP` had a dependency to `!QEMU_TARGET || NET_QEMU_SLIP`. This is changed so that SLIP prompt depends on `!QEMU_TARGET` which provides full user control in hardware but makes the symbol promptless on Qemu targets. Signed-off-by: Torsten Rasmussen <[email protected]>
No sources were ever added to the `zephyr_library()` defined in modules/hal_nxp/usb/CMakeLists.txt, thus removing this lib to avoid the warning: > No SOURCES given to Zephyr library: modules__hal_nxp__usb > > Excluding target from build. Signed-off-by: Torsten Rasmussen <[email protected]>
Fixes: #38403 The two eth_native_posix.c and eth_native_posix_adapt.c are now added to the common drivers__ethernet Zephyr library. Instead of creating a dedicated library for just two files those files are now added to the common ethernet library, see also #8826. Instead, the dedicated compile definitions required for those files are specified using COMPILE_DEFINITIONS on the source files. This also avoids the following warning as the ethernet library is no longer empty. > No SOURCES given to Zephyr library: drivers__ethernet > > Excluding target from build. Signed-off-by: Torsten Rasmussen <[email protected]>
Fixes: #38403 Removing unneeded `imply GPIO` and `CONFIG_GPIO=y` occurrences where no files are added to the gpio zephyr library. Also removed `CONFIG_GPIO=y` occurences where this is handled by defconfigs for the soc or board. Selection of GPIO without selecting any drivers results in the warning: > No SOURCES given to Zephyr library: drivers__gpio > > Excluding target from build. Signed-off-by: Torsten Rasmussen <[email protected]>
Fixes: #38403 Removing unneeded `CONFIG_CONSOLES=y` occurrences where no console driver is selected. Such selection results in an empty drivers__console zephyr library, which again results in the following warning message. > No SOURCES given to Zephyr library: drivers__console > > Excluding target from build. Signed-off-by: Torsten Rasmussen <[email protected]>
Adding support for automatic testing OOB Authentication method. Signed-off-by: Agata Ponitka <[email protected]>
…uffers count GATT/SR/GAW/BV-10-C requires more buffers as it tests nested long writes. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit d7b37d8) Signed-off-by: Robert Lubos <[email protected]>
…ls options This allows for better control over IUT behaviour by Upper Tester. PTS and TS require inconsistent behaviour in terms of how IUT should return credits. Some tests require return on explicit UT request and some require that IUT returns credits autonomously. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit 17c0132) Signed-off-by: Robert Lubos <[email protected]>
GAP/CONN/DCON/BV-01-C test case needs directed advertising support. Signed-off-by: Ilhan Ates <[email protected]> (cherry picked from commit 69abe7d) Signed-off-by: Robert Lubos <[email protected]>
Showing mac address in scanning results. Signed-off-by: Jani Hirsimäki <[email protected]> (cherry picked from commit e913fda) Signed-off-by: Robert Lubos <[email protected]>
If CONFIG_WIFI_ESP_AT_SCAN_MAC_ADDRESS: mac addr included in scanning results. if CONFIG_WIFI_ESP_AT_SCAN_PASSIVE: passive scanning is used instead of default active scanning. If CONFIG_WIFI_ESP_AT_SCAN_RESULT_RSSI_ORDERED: scanning response ordered by RSSI. Signed-off-by: Jani Hirsimäki <[email protected]> (cherry picked from commit f2859f9) Signed-off-by: Robert Lubos <[email protected]>
Align `otPlatRadioSetMacKey` with latest upstream changes. Signed-off-by: Eduardo Montoya <[email protected]> (cherry picked from commit b945d7a) Signed-off-by: Robert Lubos <[email protected]>
Implement the iscntrl() function, which returns whether a character is a control one or not. Ref: https://en.cppreference.com/w/c/string/byte/iscntrl Signed-off-by: Carles Cufi <[email protected]> (cherry picked from commit 38f6fd0) Signed-off-by: Robert Lubos <[email protected]>
OpenThread has lately got an option to provide a custom crypto backend that replaces the default, based on mbedTLS API. Implement a backend based on ARM PSA crypto API that is better suited for applications willing to take advantage of the ARM trust zone technology. Add Kconfig option: OPENTHREAD_CRYPTO_PSA_ENABLE which enables that backend. Also, another Kconfig option: OPENTHREAD_PLATFORM_KEY_REFERENCES_ENABLE, implied by the former, which enables usage of key references instead of literal keys in OpenThread. It will eventually allow OpenThread applications to keep sensitive data such as encryption keys in the secure storage, accessible from the secure world only. Signed-off-by: Damian Krolik <[email protected]> (cherry picked from commit 726656d) Signed-off-by: Robert Lubos <[email protected]>
The OpenThread stack uses uint32_t to calculate expiry time for alarms, while comparing to zephyr's uint64_t uptime. This commit fixes broken milliseconds alarms after ~49.7 days of uptime. Fixes #39704 Signed-off-by: Pieter De Gendt <[email protected]> (cherry picked from commit c89d5c5) Signed-off-by: Robert Lubos <[email protected]>
Regular upmerge on October 25th 2021. Signed-off-by: Damian Krolik <[email protected]> (cherry picked from commit e8c7e02) Signed-off-by: Robert Lubos <[email protected]>
…et in RCP Upstream PR 40083 During stack reset in RCP, the mac keys are resseting my calling otPlatRadioSetMacKey with aKeyId == 0. aKeyId == 0 was not handling properly since it is not valid for mac keys. This commit fixes it. Signed-off-by: Lukasz Maciejonczyk <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
Upstream PR 40083 This commit makes nrf5_config_mac_keys function more generic. Is uses lookup table for storing keys to override. It removes old keys before storing new ones. Signed-off-by: Lukasz Maciejonczyk <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
Upstream PR 40245 OpenThread has changed it's behaviour in terms of promt prining in the CLI module. Previously it was only printed on the UART CLI backend, now it's printed on every CLI backend. This results in a double prompt being printed when combined with Zephyr shell (one from OT and other form Zephyr). This commit adds a temporary fix to prevent OT prompt from being printed in Zehpyr shell. As a long term solution we should add an option to OpenThread to allow to disable prompt on the output. Signed-off-by: Robert Lubos <[email protected]>
Updates hal_nordic revision to fix spurious USBPWRRDY events. Signed-off-by: Johann Fischer <[email protected]> (cherry picked from commit b52c601) Signed-off-by: Robert Lubos <[email protected]>
Upstream PR 39762 This change adds a posibility to check the status of remote wakeup feature. Signed-off-by: Emil Obalski <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
…ed on disconnect This fix not being able to re-connect channel after disconnect. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit 2dbe98ce7d4dd00122b521bc5124e992f0f55a27) Signed-off-by: Robert Lubos <[email protected]>
When user only use pb-gatt provisioning, which unable to send out connectable advertising, due to adv thread not started. Signed-off-by: Lingao Meng <[email protected]> (cherry picked from commit 4ac8a824386328ac5f7b98b91168639d44131513) Signed-off-by: Robert Lubos <[email protected]>
… in error path bt_conn_unref() requires valid conn pointer but could be called with NULL in case valid connection was not found in disconnect_eatt_chans(). Fixes #39851 Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit ef0e75134ef6463025256f0904c1957b72c10693) Signed-off-by: Robert Lubos <[email protected]>
Core Specification 5.3 Vol 3. Part G. 4.2: The Signed Write Without Response sub-procedure shall only be supported on the LE Fixed Channel Unenhanced ATT bearer. This was affecting GATT/SR/GAW/BI-38-C qualification test. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit c44d0230c857114ccc8b5bf37608f67e733f38f7) Signed-off-by: Robert Lubos <[email protected]>
…onfigured_cb Pass proper length when memsetting struct. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit c9a090f1d1f6558e471ffb76cb625853374b87c9) Signed-off-by: Robert Lubos <[email protected]>
…nged callback This allows to track security levels and check for lost bond of peer peripherals. This was affecting GAP/SEC/AUT/BV-21-C qualification test. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit 3bedbc0ff0cc84d080c06d870555c66738d80882) Signed-off-by: Robert Lubos <[email protected]>
This error code informs that peer device rejected key during keys distribution phase. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit 4c32c86f0a7d839affa895d4352eb75bc74efe4a) Signed-off-by: Robert Lubos <[email protected]>
…ed event This event is sent if pairing failed. Signed-off-by: Szymon Janc <[email protected]> (cherry picked from commit e8ea882220199886cfdcc724d7a02d3c1365ed62) Signed-off-by: Robert Lubos <[email protected]>
Upstream PR 39663 This change adds a posibility to enable low latency connection parameters for BT when SMP commands are handled. Support for this functionality is disabled by the default and can be enabled by CONFIG_MCUMGR_SMP_BT_LATENCY_CONTROL=y option. Signed-off-by: Emil Obalski <[email protected]> Signed-off-by: Robert Lubos <[email protected]>
rlubos
force-pushed
the
upmerge-2021-10-20
branch
from
b8789bb to
3791175
Compare
gmarull
approved these changes
Nov 10, 2021
carlescufi
approved these changes
Nov 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
44 participants
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.
ncs-lootoutput after the reverts and the upmerge:I've manually checked the remaining
[nrf fromlist/fromtree]commits and they're either not merged yet or present only on master, not the release branch. Feel free though to double-check after me.