michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: controller: Fixing race re. adv disable in HDC

Browse source 
Re. issue "BT LL assert on LL/CON/ADV/BV-04-C #18584"

Signed-off-by: Erik Brockhoff <erbr@oticon.com>
This commit is contained in:
Erik Brockhoff 2019-08-23 15:28:57 +02:00 • committed by Carles Cufí
commit a4bd5b6835
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1188,6 +1188,22 @@ static inline u8_t disable(u16_t handle)
mark = ull_disable_mark(adv); mark = ull_disable_mark(adv);
LL_ASSERT(mark == adv); LL_ASSERT(mark == adv);
#if defined(CONFIG_BT_PERIPHERAL)
if (adv->lll.is_hdcd) {
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR,
TICKER_USER_ID_THREAD, TICKER_ID_ADV_STOP,
ull_ticker_status_give, (void *)&ret_cb);
ret = ull_ticker_status_take(ret, &ret_cb);
if (ret) {
mark = ull_disable_mark(adv);
LL_ASSERT(mark == adv);
return BT_HCI_ERR_CMD_DISALLOWED;
}
ret_cb = TICKER_STATUS_BUSY;
}
#endif
ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_THREAD, ret = ticker_stop(TICKER_INSTANCE_ID_CTLR, TICKER_USER_ID_THREAD,
TICKER_ID_ADV_BASE + handle, TICKER_ID_ADV_BASE + handle,
ull_ticker_status_give, (void *)&ret_cb); ull_ticker_status_give, (void *)&ret_cb);