michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Fix ticker resolve collision implementation

Browse source 
Fix ticker resolve collision implementation for incorrect
ticks accumulation and the calculation of next period.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2020-02-19 21:22:43 +05:30 • committed by Alberto Escolar
commit cc468e89d0
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/bluetooth/controller/ticker/ticker.c
View file

@ -654,15 +654,18 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
while (id_head != TICKER_NULL) { while (id_head != TICKER_NULL) {
struct ticker_node *ticker_next = &nodes[id_head]; struct ticker_node *ticker_next = &nodes[id_head];
/* Accumulate ticks_to_expire for each node */
acc_ticks_to_expire += ticker_next->ticks_to_expire;
if (acc_ticks_to_expire > ticker->ticks_slot) {
break;
}
/* We only care about nodes with slot reservation */ /* We only care about nodes with slot reservation */
if (ticker_next->ticks_slot == 0) { if (ticker_next->ticks_slot == 0) {
id_head = ticker_next->next; id_head = ticker_next->next;
continue; continue;
} }
/* Accumulate ticks_to_expire for each node */
acc_ticks_to_expire += ticker_next->ticks_to_expire;
s32_t lazy_next = ticker_next->lazy_current; s32_t lazy_next = ticker_next->lazy_current;
u8_t lazy_next_periodic_skip = u8_t lazy_next_periodic_skip =
ticker_next->lazy_periodic > lazy_next; ticker_next->lazy_periodic > lazy_next;
@ -708,7 +711,6 @@ static u8_t ticker_resolve_collision(struct ticker_node *nodes,
* and wins conflict resolution * and wins conflict resolution
*/ */
if (!lazy_next_periodic_skip && if (!lazy_next_periodic_skip &&
(acc_ticks_to_expire < ticker->ticks_slot) &&
(next_force || (next_force ||
next_is_critical || next_is_critical ||
(next_has_priority && !current_is_older) || (next_has_priority && !current_is_older) ||
@ -1400,8 +1402,9 @@ static inline void ticker_job_worker_bh(struct ticker_instance *instance,
/* Reload ticks_to_expire with one period */ /* Reload ticks_to_expire with one period */
ticker->ticks_to_expire = ticker->ticks_to_expire =
ticker->ticks_periodic; ticker->ticks_periodic;
ticker->ticks_to_expire +=
ticker_remainder_inc(ticker);
} }
ticker->ticks_to_expire += ticker_remainder_inc(ticker);
ticks_to_expire_prep(ticker, instance->ticks_current, ticks_to_expire_prep(ticker, instance->ticks_current,
(ticks_previous + ticks_expired)); (ticks_previous + ticks_expired));