OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bluetooth: controller: Fix auxiliary scan context release 

Fix the auxiliary scan context release to be performed in
the disabled_cb callback after the ULL reference count is
decremented.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-04-06 12:10:00 +05:30 committed by Carles Cufí
parent 3a80785947
commit 624e003064
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
subsys/bluetooth/controller/ll_sw/ull_scan.c
View File

@ -855,6 +855,7 @@ static void ticker_op_ext_stop_cb(uint32_t status, void *param)
uint32_t ret;
LL_ASSERT(!hdr->disabled_cb);
hdr->disabled_param = mfy.param;
hdr->disabled_cb = ext_disabled_cb;

35
subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
View File

@ -42,6 +42,8 @@ static inline struct ll_scan_aux_set *aux_acquire(void);
static inline void aux_release(struct ll_scan_aux_set *aux);
static inline uint8_t aux_handle_get(struct ll_scan_aux_set *aux);
static inline struct ll_sync_set *sync_create_get(struct ll_scan_set *scan);
static void last_disabled_cb(void *param);
static void done_disabled_cb(void *param);
static void flush(struct ll_scan_aux_set *aux, struct node_rx_hdr *rx);
static void ticker_cb(uint32_t ticks_at_expire, uint32_t remainder,
uint16_t lazy, uint8_t force, void *param);
@ -338,7 +340,14 @@ ull_scan_aux_rx_flush:
#endif /* CONFIG_BT_CTLR_SYNC_PERIODIC */
if (aux) {
flush(aux, rx);
struct ull_hdr *hdr;
/* Setup the disabled callback to flush the auxiliary PDUs */
hdr = &aux->ull;
LL_ASSERT(!hdr->disabled_cb);
hdr->disabled_param = rx;
hdr->disabled_cb = last_disabled_cb;
return;
}
@ -351,8 +360,14 @@ void ull_scan_aux_done(struct node_rx_event_done *done)
{
struct lll_scan_aux *lll = (void *)HDR_ULL2LLL(done->param);
struct ll_scan_aux_set *aux = (void *)HDR_LLL2EVT(lll);
struct ull_hdr *hdr;
flush(aux, NULL);
/* Setup the disabled callback to flush the auxiliary PDUs */
hdr = &aux->ull;
LL_ASSERT(!hdr->disabled_cb);
hdr->disabled_param = aux;
hdr->disabled_cb = done_disabled_cb;
}
uint8_t ull_scan_aux_lll_handle_get(struct lll_scan_aux *lll)
@ -395,6 +410,22 @@ static inline struct ll_sync_set *sync_create_get(struct ll_scan_set *scan)
#endif /* !CONFIG_BT_CTLR_SYNC_PERIODIC */
}
static void last_disabled_cb(void *param)
{
struct ll_scan_aux_set *aux;
struct node_rx_hdr *rx;
rx = param;
aux = (void *)HDR_LLL2EVT(rx->rx_ftr.param);
flush(aux, rx);
}
static void done_disabled_cb(void *param)
{
flush(param, NULL);
}
static void flush(struct ll_scan_aux_set *aux, struct node_rx_hdr *rx)
{
if (aux->rx_last) {