bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: Controller: Fix BT_CTLR_EARLY_ABORT_PREVIOUS_PREPARE

Browse Source 
Fix BT_CTLR_EARLY_ABORT_PREVIOUS_PREPARE to setup new
shorter preempt timeout irrespective of whether there
is a previous prepare enqueued in the prepare pipeline.

Relates to commit d573951f0d ("Bluetooth: Controller:
Revert back early abort of previous prepare").

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2024-04-05 15:33:49 +02:00 committed by Fabio Baltieri
parent 0c5b4f383d
commit 9383e4fbf8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
View File

@ -945,13 +945,6 @@ static uint32_t preempt_ticker_start(struct lll_event *first,
(preempt_req != preempt_ack)) {
uint32_t diff;
/* preempt timeout already started but no role/state in the head
* of prepare pipeline.
*/
if (!prev || prev->is_aborted) {
return TICKER_STATUS_SUCCESS;
}
/* Calc the preempt timeout */
p = &next->prepare_param;
ull = HDR_LLL2ULL(p->param);
@ -985,14 +978,20 @@ static uint32_t preempt_ticker_start(struct lll_event *first,
* A proper solution will be to re-design the pipeline
* as a ordered list, instead of the current FIFO.
*/
/* Set early as we get called again through the call to
* abort_cb().
/* preempt timeout already started but no role/state in the head
* of prepare pipeline.
*/
ticks_at_preempt = ticks_at_preempt_new;
if (prev && !prev->is_aborted) {
/* 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);
/* Abort previous prepare that set the preempt timeout */
prev->is_aborted = 1U;
prev->abort_cb(&prev->prepare_param,
prev->prepare_param.param);
}
#endif /* CONFIG_BT_CTLR_EARLY_ABORT_PREVIOUS_PREPARE */
/* Schedule short preempt timeout */