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

Oct 3214 cherry pick fixes from upstream #2294

Open
wants to merge 10 commits into
base: main
Choose a base branch
from

Conversation

koffes
Copy link
Contributor

@koffes koffes commented Nov 22, 2024

No description provided.

@NordicBuilder
Copy link
Contributor

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

Name Old Revision New Revision Diff
nrf_hw_models zephyrproject-rtos/nrf_hw_models@eeed259 zephyrproject-rtos/nrf_hw_models@aca798c zephyrproject-rtos/[email protected]

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

Thalley and others added 10 commits November 22, 2024 16:14
…_id for CAP

The CAP tests used u_group->cig->index but the u_group->cig may
have been deleted when the stream is released, which meant
that u_group->cig == NULL when e.g. unicast_stop_complete_cb
was called and that could cause failing tests as the index
would just be a uninitialized value.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit 5ebe119)
If a device disconnects while we are in a procedure then
get_next_active_instance would return a service instance pointer
with the `conn` set to NULL.

The issue was caused by the set_info being potentially memset
when the device that disconnected was the one that held the
set_info pointer.
The solution is to not use a pointer, but rather a copy of the
set_info, so that the active.set_info value is still valid
after a disconnect.

Since the set_info is not longer a pointer to a specific
set_info from one of the members, the logs have been updated
as well, as the pointer of the active.set_info is useless
for debugging.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit 1f1e4af)
If the lock request was rejected by a set member we should
restore any previously written logs in reverse order.

However there was a off-by-one error in
csip_set_coordinator_write_lock_cb which caused us to attempt to
release member[1] instead of member[0] if member[1] was the
one that rejected the lock request.

Additionally, the lock_set_complete would be called
prematurely before we get the response from the restore
request.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit 7c40b07)
… unicast stop

The unicast_stop function is changed to primarily do a
BAP disable instead of a release, with optional
support for releasing the streams once they have been disabled.

This also adds unittests for the procedure which also
allow us to remove the invalid param testing from the BSIM tests.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit fa4f2ff)
Added a flag parameter so that it is possible
to use the bt_cap_initiator_unicast_audio_stop to perform
disable+stop without releasing the streams by setting the
RELEASE flag.

This allows us to use the bt_cap_initiator_unicast_audio_stop
function to just disable streams without releasing them,
as that is requested by some PTS tests such as
CAP/INI/UST/BV-40-C.

Signed-off-by: Emil Gydesen <[email protected]>
(cherry picked from commit 0fa9701a260d49f946e46841a607b14065b715c3)
Assert to check columns. Averts a potential divide by zero

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
(cherry picked from commit c73c5d9)
Add a substitute for NVIC_GetPendingIRQ()

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 1c75408)
Some apps use it, so let's provide it.

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit c4e6ec8)
Update the HW models module to:
aca798cf7cf0c5dc1fd89c66cf62670051feb8d0

Including the following:
* aca798c IRQ controller: Add missing prototype
* 4f108bc IRQ controller: Add API to check if int is pending
* a514448 MDK: provide replacement for SystemCoreClock*

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 15a7819)
Align with native_simulator's upstream main
51b27b67addd0073dc86e3d83f492c5cac5c3361

Which includes:
* 51b27b nsi_utils: Add macro for weak declarations

Signed-off-by: Alberto Escolar Piedras <[email protected]>
(cherry picked from commit 6ffbb8c)
@koffes koffes force-pushed the OCT-3214-cherry-pick-required-pts-fixes-from-upstream branch from 04289ec to bdcf413 Compare November 22, 2024 15:15
@koffes koffes changed the title Oct 3214 cherry pick required pts fixes from upstream Oct 3214 cherry pick fixes from upstream Nov 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants