michaelh/zephyr
1
0
Fork 0
Code Releases Activity

rf: JIT scheduler fixes and improvements

Browse source 
- Prevent double callback with ADV re-scheduling
  For configurations using CONFIG_BT_CTLR_JIT_SCHEDULING, when last
  ADV before initiating connection is re-scheduled with a small delay,
  the disabled_cb would be called a second time. This would unexpectedly
  invoke a second conn setup with illegal parameters.
  To avoid this JIT scheduler phenomenon, clear the ADV disabled_cb
  when invoked.
- Add priority to LLL header. This allows the conn priority to be
  associated with the object. Used in vendor LLL implementation.

Signed-off-by: Morten Priess <mtpr@oticon.com>
This commit is contained in:
Morten Priess 2022-01-19 09:24:38 +01:00 • committed by Anas Nashif
commit 1417e8f8c7
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
subsys/bluetooth/controller/ll_sw/lll.h
View file

@ -206,6 +206,7 @@ struct lll_hdr {
#if defined(CONFIG_BT_CTLR_JIT_SCHEDULING) #if defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
uint8_t score; uint8_t score;
uint8_t latency; uint8_t latency;
int8_t prio;
#endif /* CONFIG_BT_CTLR_JIT_SCHEDULING */ #endif /* CONFIG_BT_CTLR_JIT_SCHEDULING */
}; };

19
subsys/bluetooth/controller/ll_sw/ull_adv.c
View file

@ -1813,7 +1813,8 @@ uint8_t ull_scan_rsp_set(struct ll_adv_set *adv, uint8_t len,
static uint32_t ticker_update_rand(struct ll_adv_set *adv, uint32_t ticks_delay_window, static uint32_t ticker_update_rand(struct ll_adv_set *adv, uint32_t ticks_delay_window,
uint32_t ticks_delay_window_offset, uint32_t ticks_delay_window_offset,
uint32_t ticks_adjust_minus) uint32_t ticks_adjust_minus,
ticker_op_func fp_op_func)
{ {
uint32_t random_delay; uint32_t random_delay;
uint32_t ret; uint32_t ret;
@ -1831,10 +1832,11 @@ static uint32_t ticker_update_rand(struct ll_adv_set *adv, uint32_t ticks_delay_
TICKER_ID_ADV_BASE + ull_adv_handle_get(adv), TICKER_ID_ADV_BASE + ull_adv_handle_get(adv),
random_delay, random_delay,
ticks_adjust_minus, 0, 0, 0, 0, ticks_adjust_minus, 0, 0, 0, 0,
ticker_update_op_cb, adv); fp_op_func, adv);
LL_ASSERT((ret == TICKER_STATUS_SUCCESS) || LL_ASSERT((ret == TICKER_STATUS_SUCCESS) ||
(ret == TICKER_STATUS_BUSY)); (ret == TICKER_STATUS_BUSY) ||
(fp_op_func == NULL));
#if defined(CONFIG_BT_CTLR_JIT_SCHEDULING) #if defined(CONFIG_BT_CTLR_JIT_SCHEDULING)
adv->delay = random_delay; adv->delay = random_delay;
@ -1899,9 +1901,13 @@ void ull_adv_done(struct node_rx_event_done *done)
ticks_adjust_minus = HAL_TICKER_US_TO_TICKS( ticks_adjust_minus = HAL_TICKER_US_TO_TICKS(
(uint64_t)adv->interval * ADV_INT_UNIT_US) + adv->delay; (uint64_t)adv->interval * ADV_INT_UNIT_US) + adv->delay;
/* Apply random delay in range [prepare_overhead..delay_remain] */ /* Apply random delay in range [prepare_overhead..delay_remain].
* NOTE: This ticker_update may fail if update races with
* ticker_stop, e.g. from ull_periph_setup. This is not a problem
* and we can safely ignore the operation result.
*/
ticker_update_rand(adv, adv->delay_remain - prepare_overhead, ticker_update_rand(adv, adv->delay_remain - prepare_overhead,
prepare_overhead, ticks_adjust_minus); prepare_overhead, ticks_adjust_minus, NULL);
/* Score of the event was increased due to the result, but since /* Score of the event was increased due to the result, but since
* we're getting a another chance we'll set it back. * we're getting a another chance we'll set it back.
@ -2210,7 +2216,8 @@ static void ticker_cb(uint32_t ticks_at_expire, uint32_t ticks_drift,
#endif /* CONFIG_BT_PERIPHERAL */ #endif /* CONFIG_BT_PERIPHERAL */
{ {
/* Apply random delay in range [0..ULL_ADV_RANDOM_DELAY] */ /* Apply random delay in range [0..ULL_ADV_RANDOM_DELAY] */
random_delay = ticker_update_rand(adv, ULL_ADV_RANDOM_DELAY, 0, 0); random_delay = ticker_update_rand(adv, ULL_ADV_RANDOM_DELAY,
0, 0, ticker_update_op_cb);
#if defined(CONFIG_BT_CTLR_ADV_EXT) #if defined(CONFIG_BT_CTLR_ADV_EXT)
adv->event_counter += (lazy + 1); adv->event_counter += (lazy + 1);

9
subsys/bluetooth/controller/ll_sw/ull_conn.c
View file

@ -2244,6 +2244,15 @@ static void conn_setup_adv_scan_disabled_cb(void *param)
ftr = &(rx->rx_ftr); ftr = &(rx->rx_ftr);
lll = *((struct lll_conn **)((uint8_t *)ftr->param + lll = *((struct lll_conn **)((uint8_t *)ftr->param +
sizeof(struct lll_hdr))); sizeof(struct lll_hdr)));
if (IS_ENABLED(CONFIG_BT_CTLR_JIT_SCHEDULING)) {
struct ull_hdr *hdr;
/* Prevent fast ADV re-scheduling from re-triggering */
hdr = HDR_LLL2ULL(ftr->param);
hdr->disabled_cb = NULL;
}
switch (lll->role) { switch (lll->role) {
#if defined(CONFIG_BT_CENTRAL) #if defined(CONFIG_BT_CENTRAL)
case 0: case 0: