michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Fix short prepare when many enqueued in pipeline

Browse source 
Fix short prepare handling when more than one event is
enqueued in the pipeline and the short prepare is placed at
the end of the prepare pipeline.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2022-01-18 17:52:06 +05:30 • committed by Carles Cufí
commit 7f388bb70a
1 changed files with 46 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

69
subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
View file

@ -899,15 +899,6 @@ static uint32_t preempt_ticker_start(struct lll_event *first,
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
(ret == TICKER_STATUS_BUSY));
/* Set early as we get called again through the call to
* abort_cb().
*/
ticks_at_preempt = ticks_at_preempt_new;
/* Abort previous prepare that set the preempt timeout */
prev->is_aborted = 1U;
prev->abort_cb(&prev->prepare_param, prev->prepare_param.param);
/* Schedule short preempt timeout */
first = next;
} else {
@ -996,17 +987,11 @@ static void preempt(void *param)
return;
}
/* Check if any prepare in pipeline */
idx = UINT8_MAX;
next = ull_prepare_dequeue_iter(&idx);
if (!next) {
return;
}
/* Find a prepare that is ready and not a resume */
while (next && (next->is_aborted || next->is_resume)) {
idx = UINT8_MAX;
do {
next = ull_prepare_dequeue_iter(&idx);
}
} while (next && (next->is_aborted || next->is_resume));
/* No ready prepare */
if (!next) {
@ -1015,14 +1000,52 @@ static void preempt(void *param)
/* Preemptor not in pipeline */
if (next->prepare_param.param != param) {
struct lll_event *next_next = NULL;
struct lll_event *e;
uint32_t ret;
/* Start the preempt timeout */
ret = preempt_ticker_start(next, NULL, next);
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
(ret == TICKER_STATUS_BUSY));
/* Find if a short prepare request in the pipeline */
do {
e = ull_prepare_dequeue_iter(&idx);
if (!next_next && e && !e->is_aborted &&
!e->is_resume) {
next_next = e;
}
} while (e && (e->is_aborted || e->is_resume ||
(e->prepare_param.param != param)));
return;
/* No short prepare request in pipeline */
if (!e) {
/* Start the preempt timeout for next event */
ret = preempt_ticker_start(next, NULL, next);
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
(ret == TICKER_STATUS_BUSY));
return;
}
/* FIXME: Abort all events in pipeline before the short
* prepare event. For now, lets assert when many
* enqueued prepares need aborting.
*/
LL_ASSERT(next_next == e);
/* Abort the prepare that is present before the short prepare */
next->is_aborted = 1;
next->abort_cb(&next->prepare_param, next->prepare_param.param);
/* As the prepare queue has been refreshed due to the call of
* abort_cb which invokes the lll_done, find the latest prepare
*/
idx = UINT8_MAX;
do {
next = ull_prepare_dequeue_iter(&idx);
} while (next && (next->is_aborted || next->is_resume));
/* No ready prepare */
if (!next) {
return;
}
}
/* Check if current event want to continue */